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

Merge pull request #285 from jpcima/settings-per-voice

Browse source 
Keep voice settings and restore them after polyphony change
This commit is contained in:
JP Cimalando 2020-06-21 19:55:38 +02:00 • committed by GitHub
commit ba0c68f5a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/sfizz/Synth.cpp
View file

@ -491,11 +491,11 @@ void sfz::Synth::finalizeSfzLoad()
regions.resize(currentRegionCount);
modificationTime = checkModificationTime();
for (auto& voice : voices) {
voice->setMaxFiltersPerVoice(maxFilters);
voice->setMaxEQsPerVoice(maxEQs);
voice->prepareSmoothers(maxModifiers);
}
settingsPerVoice.maxFilters = maxFilters;
settingsPerVoice.maxEQs = maxEQs;
settingsPerVoice.maxModifiers = maxModifiers;
applySettingsPerVoice();
}
bool sfz::Synth::loadScalaFile(const fs::path& path)
@ -1205,6 +1205,17 @@ void sfz::Synth::resetVoices(int numVoices)
}
this->numVoices = numVoices;
applySettingsPerVoice();
}
void sfz::Synth::applySettingsPerVoice()
{
for (auto& voice : voices) {
voice->setMaxFiltersPerVoice(settingsPerVoice.maxFilters);
voice->setMaxEQsPerVoice(settingsPerVoice.maxEQs);
voice->prepareSmoothers(settingsPerVoice.maxModifiers);
}
}
void sfz::Synth::setOversamplingFactor(sfz::Oversampling factor) noexcept

12
src/sfizz/Synth.h
View file

@ -631,6 +631,10 @@ private:
* @param numVoices
*/
void resetVoices(int numVoices);
/**
* @brief Make the stored settings take effect in all the voices
*/
void applySettingsPerVoice();
/**
* @brief Render the voice to its designated outputs and effect busses.
@ -702,6 +706,14 @@ private:
int noteOffset { 0 };
int octaveOffset { 0 };
// Settings per voice
struct SettingsPerVoice {
size_t maxFilters { 0 };
size_t maxEQs { 0 };
ModifierArray<size_t> maxModifiers { 0 };
};
SettingsPerVoice settingsPerVoice;
Duration dispatchDuration { 0 };
Parser parser;