sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply the tuning key offset, to match surge library

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-05-21 15:09:01 +02:00
parent ca547f7de9
commit e2463b80db
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/sfizz/Tuning.cpp
View file

@ -45,6 +45,7 @@ private:
}; };
static constexpr int numKeys = Tunings::Tuning::N; static constexpr int numKeys = Tunings::Tuning::N;
static constexpr int keyOffset = 256; // Surge tuning has key range ±256
std::array<float, numKeys> keysFractional12TET_; std::array<float, numKeys> keysFractional12TET_;
}; };
@ -55,7 +56,7 @@ constexpr int Tuning::Impl::numKeys;
float Tuning::Impl::getKeyFractional12TET(int midiKey) const float Tuning::Impl::getKeyFractional12TET(int midiKey) const
{ {
return keysFractional12TET_[std::max(0, std::min(numKeys - 1, midiKey))]; return keysFractional12TET_[std::max(0, std::min(numKeys - 1, midiKey + keyOffset))];
} }
void Tuning::Impl::updateScale(const Tunings::Scale& scale) void Tuning::Impl::updateScale(const Tunings::Scale& scale)
@ -94,7 +95,7 @@ void Tuning::Impl::updateKeysFractional12TET()
{ {
// mapping of MIDI key to equal temperament key // mapping of MIDI key to equal temperament key
for (int key = 0; key < numKeys; ++key) { for (int key = 0; key < numKeys; ++key) {
double freq = tuning_.frequencyForMidiNote(key); double freq = tuning_.frequencyForMidiNote(key - keyOffset);
keysFractional12TET_[key] = 12.0 * std::log2(freq / 440.0) + 69.0; keysFractional12TET_[key] = 12.0 * std::log2(freq / 440.0) + 69.0;
} }
} }