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

Parse sw_label

Browse source
This commit is contained in:
Paul Fd 2020-04-16 00:53:21 +02:00
parent 5f94e34230
commit aa4af91131
3 changed files with 13 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

@ -199,6 +199,9 @@ bool sfz::Region::parseOpcode(const Opcode& opcode)
setValueFromOpcode(opcode, keyswitch, Default::keyRange); setValueFromOpcode(opcode, keyswitch, Default::keyRange);
keySwitched = false; keySwitched = false;
break; break;
case hash("sw_label"):
keyswitchLabel = opcode.value;
break;
case hash("sw_down"): case hash("sw_down"):
setValueFromOpcode(opcode, keyswitchDown, Default::keyRange); setValueFromOpcode(opcode, keyswitchDown, Default::keyRange);
keySwitched = false; keySwitched = false;

1
src/sfizz/Region.h
View file

@ -259,6 +259,7 @@ struct Region {
CCMap<Range<float>> ccConditions { Default::ccValueRange }; CCMap<Range<float>> ccConditions { Default::ccValueRange };
Range<uint8_t> keyswitchRange { Default::keyRange }; // sw_hikey and sw_lokey Range<uint8_t> keyswitchRange { Default::keyRange }; // sw_hikey and sw_lokey
absl::optional<uint8_t> keyswitch {}; // sw_last absl::optional<uint8_t> keyswitch {}; // sw_last
absl::optional<std::string> keyswitchLabel {};
absl::optional<uint8_t> keyswitchUp {}; // sw_up absl::optional<uint8_t> keyswitchUp {}; // sw_up
absl::optional<uint8_t> keyswitchDown {}; // sw_down absl::optional<uint8_t> keyswitchDown {}; // sw_down
absl::optional<uint8_t> previousNote {}; // sw_previous absl::optional<uint8_t> previousNote {}; // sw_previous

9
tests/RegionT.cpp
View file

@ -273,6 +273,15 @@ TEST_CASE("[Region] Parsing opcodes")
REQUIRE(region.keyswitchRange == sfz::Range<uint8_t>(0, 0)); REQUIRE(region.keyswitchRange == sfz::Range<uint8_t>(0, 0));
} }
SECTION("sw_label")
{
REQUIRE(!region.keyswitchLabel);
region.parseOpcode({ "sw_label", "note" });
REQUIRE(region.keyswitchLabel == "note");
region.parseOpcode({ "sw_label", "ring" });
REQUIRE(region.keyswitchLabel == "ring");
}
SECTION("sw_last") SECTION("sw_last")
{ {
REQUIRE(!region.keyswitch); REQUIRE(!region.keyswitch);