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

Voices can also be offed by note-off events

Browse source 
Also add a check to see if a voice is already released in checkOffGroup,
preventing and endless recursion
This commit is contained in:
Paul Fd 2021-04-04 22:24:43 +02:00
parent f189292a60
commit 0c1687b5fa
4 changed files with 48 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/sfizz/Synth.cpp
View file

@ -1088,6 +1088,16 @@ void Synth::Impl::startVoice(Layer* layer, int delay, const TriggerEvent& trigge
ring.addVoiceToRing(selectedVoice);
}
void Synth::Impl::checkOffGroups(const Region* region, int delay, int number)
{
for (auto& voice : voiceManager_) {
if (voice.checkOffGroup(region, delay, number)) {
const TriggerEvent& event = voice.getTriggerEvent();
noteOffDispatch(delay, event.number, event.value);
}
}
}
void Synth::Impl::noteOffDispatch(int delay, int noteNumber, float velocity) noexcept
{
const auto randValue = randNoteDistribution_(Random::randomGenerator);
@ -1106,6 +1116,7 @@ void Synth::Impl::noteOffDispatch(int delay, int noteNumber, float velocity) noe
if (region.trigger == Trigger::release && !region.rtDead && !voiceManager_.playingAttackVoice(&region))
continue;
checkOffGroups(&region, delay, noteNumber);
startVoice(layer, delay, triggerEvent, ring);
}
}
@ -1136,13 +1147,7 @@ void Synth::Impl::noteOnDispatch(int delay, int noteNumber, float velocity) noex
for (Layer* layer : noteActivationLists_[noteNumber]) {
if (layer->registerNoteOn(noteNumber, velocity, randValue)) {
const Region& region = layer->getRegion();
for (auto& voice : voiceManager_) {
if (voice.checkOffGroup(&region, delay, noteNumber)) {
const TriggerEvent& event = voice.getTriggerEvent();
noteOffDispatch(delay, event.number, event.value);
}
}
checkOffGroups(&region, delay, noteNumber);
TriggerEvent triggerEvent { TriggerEventType::NoteOn, noteNumber, velocity };
startVoice(layer, delay, triggerEvent, ring);
}
@ -1215,12 +1220,7 @@ void Synth::Impl::ccDispatch(int delay, int ccNumber, float value) noexcept
}
if (layer->registerCC(ccNumber, value)) {
for (auto& voice : voiceManager_) {
if (voice.checkOffGroup(&region, delay, ccNumber)) {
const TriggerEvent& event = voice.getTriggerEvent();
noteOffDispatch(delay, event.number, event.value);
}
}
checkOffGroups(&region, delay, ccNumber);
startVoice(layer, delay, triggerEvent, ring);
}
}

10
src/sfizz/SynthPrivate.h
View file

@ -219,6 +219,16 @@ struct Synth::Impl final: public Parser::Listener {
*/
void setDefaultHdcc(int ccNumber, float value);
/**
* @brief Check if we have to kill any voice when starting a new one
* on the specified region with the specified note/cc number
*
* @param region
* @param delay
* @param number
*/
void checkOffGroups(const Region* region, int delay, int number);
int numGroups_ { 0 };
int numMasters_ { 0 };

3
src/sfizz/Voice.cpp
View file

@ -1571,6 +1571,9 @@ bool Voice::checkOffGroup(const Region* other, int delay, int noteNumber) noexce
if (region == nullptr || other == nullptr)
return false;
if (impl.released())
return false;
if (impl.triggerEvent_.type == TriggerEventType::NoteOn
&& region->offBy && *region->offBy == other->group
&& (region->group != other->group || noteNumber != impl.triggerEvent_.number)) {

22
tests/SynthT.cpp
View file

@ -1626,6 +1626,28 @@ TEST_CASE("[Synth] Off by a CC event")
REQUIRE( numPlayingVoices(synth) == 1 );
}
TEST_CASE("[Synth] Off by a note-off event")
{
sfz::Synth synth;
sfz::AudioBuffer<float> buffer { 2, static_cast<unsigned>(synth.getSamplesPerBlock()) };
synth.loadSfzString(fs::current_path(), R"(
<region> key=60 group=1 off_by=2 sample=*saw
<region> key=62 sample=*silence
<region> key=62 trigger=release group=2 sample=*silence
)");
synth.noteOn(0, 60, 85);
synth.renderBlock(buffer);
REQUIRE( numPlayingVoices(synth) == 1 );
synth.noteOn(0, 62, 85);
synth.renderBlock(buffer);
REQUIRE( numPlayingVoices(synth) == 2 );
synth.noteOff(10, 62, 85);
synth.renderBlock(buffer);
REQUIRE( numPlayingVoices(synth) == 1 );
// TODO: check the samples; the last one should be *silence
}
TEST_CASE("[Synth] Initial values of CC")
{
sfz::Synth synth;