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

Off voices rather than killing them

Browse source
This commit is contained in:
Paul Ferrand 2020-08-10 17:22:05 +02:00
parent 3fdf0ef7cd
commit 812a867194
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/sfizz/Synth.cpp
View file

@ -919,7 +919,7 @@ void sfz::Synth::noteOnDispatch(int delay, int noteNumber, float velocity) noexc
continue; continue;
} }
if (voice->getRegion() == region) { if (voice->getRegion() == region && !voice->releasedOrFree()) {
regionPolyphonyArray.push_back(voice.get()); regionPolyphonyArray.push_back(voice.get());
} }
@ -953,31 +953,29 @@ void sfz::Synth::noteOnDispatch(int delay, int noteNumber, float velocity) noexc
if (region->notePolyphony if (region->notePolyphony
&& notePolyphonyCounter >= *region->notePolyphony && notePolyphonyCounter >= *region->notePolyphony
&& selfMaskCandidate != nullptr) { && selfMaskCandidate != nullptr) {
selfMaskCandidate->release(delay); SisterVoiceRing::offAllSisters(selfMaskCandidate, delay);
} }
auto parent = region->parent; auto parent = region->parent;
// Polyphony reached on region // Polyphony reached on region
if (regionPolyphonyArray.size() >= region->polyphony) { if (regionPolyphonyArray.size() >= region->polyphony) {
selectedVoice = stealer.steal(absl::MakeSpan(regionPolyphonyArray)); const auto activeVoices = absl::MakeSpan(regionPolyphonyArray);
goto render; SisterVoiceRing::offAllSisters(stealer.steal(activeVoices), delay);
} }
// Polyphony reached on polyphony group // Polyphony reached on polyphony group
if (polyphonyGroups[region->group].getActiveVoices().size() if (polyphonyGroups[region->group].numPlayingVoices()
== polyphonyGroups[region->group].getPolyphonyLimit()) { == polyphonyGroups[region->group].getPolyphonyLimit()) {
const auto activeVoices = absl::MakeSpan(polyphonyGroups[region->group].getActiveVoices()); const auto activeVoices = absl::MakeSpan(polyphonyGroups[region->group].getActiveVoices());
selectedVoice = stealer.steal(activeVoices); SisterVoiceRing::offAllSisters(stealer.steal(activeVoices), delay);
goto render;
} }
// Polyphony reached some parent group/master/etc // Polyphony reached some parent group/master/etc
while (parent != nullptr) { while (parent != nullptr) {
if (parent->getActiveVoices().size() >= parent->getPolyphonyLimit()) { if (parent->numPlayingVoices() >= parent->getPolyphonyLimit()) {
const auto activeVoices = absl::MakeSpan(parent->getActiveVoices()); const auto activeVoices = absl::MakeSpan(parent->getActiveVoices());
selectedVoice = stealer.steal(activeVoices); SisterVoiceRing::offAllSisters(stealer.steal(activeVoices), delay);
goto render;
} }
parent = parent->getParent(); parent = parent->getParent();
} }
@ -987,7 +985,6 @@ void sfz::Synth::noteOnDispatch(int delay, int noteNumber, float velocity) noexc
selectedVoice = stealer.steal(absl::MakeSpan(voiceViewArray)); selectedVoice = stealer.steal(absl::MakeSpan(voiceViewArray));
} }
render:
// For some reason we did not find a voice to use. // For some reason we did not find a voice to use.
// This is a degraded case but we'll just drop the note on. // This is a degraded case but we'll just drop the note on.
if (selectedVoice == nullptr) if (selectedVoice == nullptr)