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

Regions on the same note but with different groups do get muted

Browse source 
This happens e.g. with keyswitches. This behavior is slightly different from Cakewalk's apparently.
This commit is contained in:
Paul Ferrand 2020-09-09 13:06:24 +02:00
parent afadb171a4
commit d2e8c0548f
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sfizz/Voice.cpp
View file

@ -713,9 +713,9 @@ bool sfz::Voice::checkOffGroup(const Region* other, int delay, int noteNumber) n
if (region == nullptr || other == nullptr) if (region == nullptr || other == nullptr)
return false; return false;
if (triggerEvent.type == TriggerEventType::NoteOn if (triggerEvent.type == TriggerEventType::NoteOn
&& region->offBy == other->group && region->offBy == other->group
&& noteNumber != triggerEvent.number) { && (region->group != other->group || noteNumber != triggerEvent.number)) {
off(delay); off(delay);
return true; return true;
} }

24
tests/SynthT.cpp
View file

@ -1286,3 +1286,27 @@ TEST_CASE("[Synth] Off by same note and group")
REQUIRE( numPlayingVoices(synth) == 2 ); REQUIRE( numPlayingVoices(synth) == 2 );
synth.noteOn(0, 60, 85); synth.noteOn(0, 60, 85);
} }
TEST_CASE("[Synth] Off by with CC switches")
{
sfz::Synth synth;
sfz::AudioBuffer<float> buffer { 2, 256 };
synth.loadSfzString(fs::current_path(), R"(
<group> ampeg_decay=5 ampeg_sustain=0 ampeg_release=5 key=60
<region> sample=*saw transpose=12 group=1 off_by=2 hicc4=63
<region> sample=*triangle group=2 off_by=1 locc4=64
)");
synth.noteOn(0, 60, 85);
REQUIRE( numPlayingVoices(synth) == 1 );
REQUIRE( getPlayingVoices(synth).front()->getRegion()->sampleId.filename() == "*saw" );
synth.cc(0, 4, 127);
synth.noteOn(0, 60, 85);
REQUIRE( numPlayingVoices(synth) == 1 );
REQUIRE( getPlayingVoices(synth).front()->getRegion()->sampleId.filename() == "*triangle" );
synth.cc(0, 4, 0);
synth.noteOn(0, 60, 85);
REQUIRE( numPlayingVoices(synth) == 1 );
REQUIRE( getPlayingVoices(synth).front()->getRegion()->sampleId.filename() == "*saw" );
}