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

Check that there is a voice playing for release samples

Browse source
This commit is contained in:
Paul Ferrand 2020-08-09 16:02:41 +02:00
parent bbf22b058e
commit 39abff2cca
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/sfizz/Synth.cpp
View file

@ -844,6 +844,25 @@ void sfz::Synth::noteOffDispatch(int delay, int noteNumber, float velocity) noex
for (auto& region : noteActivationLists[noteNumber]) { for (auto& region : noteActivationLists[noteNumber]) {
if (region->registerNoteOff(noteNumber, velocity, randValue)) { if (region->registerNoteOff(noteNumber, velocity, randValue)) {
if (region->triggerOnNote && region->trigger == SfzTrigger::release && !region->rtDead) {
// check that a voice with compatible trigger is playing
// FIXME: we're going twice over the voices, when the synth
// handles the regions completely these dispatch functions
// should be overhauled, also to include voice stealing on
// all events
const auto compatibleVoice = [region](const VoicePtr& v) -> bool {
return (
!v->isFree()
&& v->getTriggerType() == Voice::TriggerType::NoteOn
&& region->keyRange.containsWithEnd(v->getTriggerNumber())
&& region->velocityRange.containsWithEnd(v->getTriggerValue())
);
};
if (absl::c_find_if(voices, compatibleVoice) == voices.end())
continue;
}
auto voice = findFreeVoice(); auto voice = findFreeVoice();
if (voice == nullptr) if (voice == nullptr)
continue; continue;
@ -1002,6 +1021,27 @@ void sfz::Synth::hdcc(int delay, int ccNumber, float normValue) noexcept
for (auto& region : ccActivationLists[ccNumber]) { for (auto& region : ccActivationLists[ccNumber]) {
if (ccNumber == region->sustainCC) { if (ccNumber == region->sustainCC) {
if (!region->rtDead) {
// check that a voice with compatible trigger is playing
// FIXME: we're going twice over the voices, when the synth
// handles the regions completely these dispatch functions
// should be overhauled, also to include voice stealing on
// all events
const auto compatibleVoice = [region](const VoicePtr& v) -> bool {
return (
!v->isFree()
&& v->getTriggerType() == Voice::TriggerType::NoteOn
&& region->keyRange.containsWithEnd(v->getTriggerNumber())
&& region->velocityRange.containsWithEnd(v->getTriggerValue())
);
};
if (absl::c_find_if(voices, compatibleVoice) == voices.end()) {
region->delayedReleases.clear();
continue;
}
}
for (auto& note: region->delayedReleases) { for (auto& note: region->delayedReleases) {
// FIXME: we really need to have some form of common method to find and start voices... // FIXME: we really need to have some form of common method to find and start voices...
auto voice = findFreeVoice(); auto voice = findFreeVoice();