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

Merge pull request #941 from paulfd/salamander

Browse source 
Passing lokey=-1 does not reactivate the note trigger
This commit is contained in:
Paul Ferrand 2021-07-05 18:28:20 +02:00 • committed by GitHub
commit 2be91453e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sfizz/Region.cpp
View file

@ -208,8 +208,12 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode, bool cleanOpcode)
break; break;
// Region logic: key mapping // Region logic: key mapping
case hash("lokey"): case hash("lokey"):
triggerOnNote = true; {
keyRange.setStart(opcode.read(Default::loKey)); absl::optional<uint8_t> optValue = opcode.readOptional(Default::loKey);
triggerOnNote = optValue != absl::nullopt;
uint8_t value = optValue.value_or(Default::loKey);
keyRange.setStart(value);
}
break; break;
case hash("hikey"): case hash("hikey"):
{ {

3
tests/RegionValuesT.cpp
View file

@ -566,17 +566,20 @@ TEST_CASE("[Values] Triggers on note")
<region> sample=kick.wav hikey=-1 <region> sample=kick.wav hikey=-1
<region> sample=kick.wav key=-1 <region> sample=kick.wav key=-1
<region> sample=kick.wav hikey=-1 lokey=12 <region> sample=kick.wav hikey=-1 lokey=12
<region> sample=kick.wav hikey=-1 lokey=-1
)"); )");
synth.dispatchMessage(client, 0, "/region0/trigger_on_note", "", nullptr); synth.dispatchMessage(client, 0, "/region0/trigger_on_note", "", nullptr);
synth.dispatchMessage(client, 0, "/region1/trigger_on_note", "", nullptr); synth.dispatchMessage(client, 0, "/region1/trigger_on_note", "", nullptr);
synth.dispatchMessage(client, 0, "/region2/trigger_on_note", "", nullptr); synth.dispatchMessage(client, 0, "/region2/trigger_on_note", "", nullptr);
// TODO: Double check with Sforzando/rgc // TODO: Double check with Sforzando/rgc
synth.dispatchMessage(client, 0, "/region3/trigger_on_note", "", nullptr); synth.dispatchMessage(client, 0, "/region3/trigger_on_note", "", nullptr);
synth.dispatchMessage(client, 0, "/region4/trigger_on_note", "", nullptr);
std::vector<std::string> expected { std::vector<std::string> expected {
"/region0/trigger_on_note,T : { }", "/region0/trigger_on_note,T : { }",
"/region1/trigger_on_note,F : { }", "/region1/trigger_on_note,F : { }",
"/region2/trigger_on_note,F : { }", "/region2/trigger_on_note,F : { }",
"/region3/trigger_on_note,T : { }", "/region3/trigger_on_note,T : { }",
"/region4/trigger_on_note,F : { }",
}; };
REQUIRE(messageList == expected); REQUIRE(messageList == expected);
} }