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

Consider the previous velocity for triggers

Browse source
This commit is contained in:
Paul Fd 2021-02-23 13:45:29 +01:00
parent d95c70aa68
commit 669f7ff79e
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/sfizz/Region.cpp
View file

@ -1484,6 +1484,9 @@ bool sfz::Region::registerNoteOn(int noteNumber, float velocity, float randValue
if (!triggerOnNote) if (!triggerOnNote)
return false; return false;
if (velocityOverride == VelocityOverride::previous)
velocity = midiState.getLastVelocity();
const bool velOk = velocityRange.containsWithEnd(velocity); const bool velOk = velocityRange.containsWithEnd(velocity);
const bool randOk = randRange.contains(randValue) || (randValue == 1.0f && randRange.getEnd() == 1.0f); const bool randOk = randRange.contains(randValue) || (randValue == 1.0f && randRange.getEnd() == 1.0f);
const bool firstLegatoNote = (trigger == Trigger::first && midiState.getActiveNotes() == 1); const bool firstLegatoNote = (trigger == Trigger::first && midiState.getActiveNotes() == 1);

39
tests/RegionTriggersT.cpp
View file

@ -301,3 +301,42 @@ TEST_CASE("[Triggers] sw_vel, with a note in between and sw_previous")
}; };
REQUIRE(messageList == expected); REQUIRE(messageList == expected);
} }
TEST_CASE("[Triggers] sw_vel, consider the previous velocity for triggers")
{
Synth synth;
std::vector<std::string> messageList;
Client client(&messageList);
client.setReceiveCallback(&simpleMessageReceiver);
synth.loadSfzString(fs::current_path() / "tests/TestFiles/sw_vel.sfz", R"(
<region> key=60 sample=kick.wav
<region> key=62 sw_previous=60 sw_vel=previous sample=snare.wav lovel=63
)");
SECTION("Should trigger") {
synth.noteOn(0, 60, 127);
synth.noteOn(10, 62, 10);
synth.dispatchMessage(client, 0, "/num_active_voices", "", nullptr);
synth.dispatchMessage(client, 0, "/voice0/trigger_value", "", nullptr);
synth.dispatchMessage(client, 0, "/voice1/trigger_value", "", nullptr);
std::vector<std::string> expected {
"/num_active_voices,i : { 2 }",
"/voice0/trigger_value,f : { 1 }",
"/voice1/trigger_value,f : { 1 }",
};
REQUIRE(messageList == expected);
}
SECTION("Should not trigger") {
synth.noteOn(0, 60, 10);
synth.noteOn(10, 62, 127);
synth.dispatchMessage(client, 0, "/num_active_voices", "", nullptr);
synth.dispatchMessage(client, 0, "/voice0/trigger_value", "", nullptr);
synth.dispatchMessage(client, 0, "/voice1/trigger_value", "", nullptr);
std::vector<std::string> expected {
"/num_active_voices,i : { 1 }",
"/voice0/trigger_value,f : { 0.0787402 }",
};
REQUIRE(messageList == expected);
}
}