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

Add support of some Cakewalk aliases

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-09-28 14:08:41 +02:00
parent 35fc1f0105
commit d18da2060c
4 changed files with 793 additions and 600 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1375
src/sfizz/OpcodeCleanup.cpp
View file

File diff suppressed because it is too large Load diff

11
src/sfizz/OpcodeCleanup.re
View file

@ -76,6 +76,7 @@ end_region_oncc:
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
if (scope == kOpcodeScopeRegion) { if (scope == kOpcodeScopeRegion) {
again_region:
YYCURSOR = opcode.c_str(); YYCURSOR = opcode.c_str();
@ -137,6 +138,11 @@ end_region_oncc:
goto end_region; goto end_region;
} }
"gain_random" END {
opcode = "amp_random";
goto end_region;
}
"gain" ("_" any)? END { "gain" ("_" any)? END {
opcode = absl::StrCat("volume", group(1)); opcode = absl::StrCat("volume", group(1));
goto end_region; goto end_region;
@ -155,6 +161,11 @@ end_region_oncc:
goto end_region; goto end_region;
} }
"cutoff" (number)? "_random" END {
opcode = absl::StrCat("fil", group(1), "_random");
goto again_region;
}
"fil_" (any) END { "fil_" (any) END {
opcode = absl::StrCat("fil1_", group(1)); opcode = absl::StrCat("fil1_", group(1));
goto end_region; goto end_region;

2
src/sfizz/Region.cpp
View file

@ -654,7 +654,7 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode)
setValueFromOpcode(opcode, filters[filterIndex].veltrack, Default::filterVeltrackRange); setValueFromOpcode(opcode, filters[filterIndex].veltrack, Default::filterVeltrackRange);
} }
break; break;
case hash("fil&_random"): // also fil_random case hash("fil&_random"): // also fil_random, cutoff_random, cutoff&_random
{ {
const auto filterIndex = opcode.parameters.front() - 1; const auto filterIndex = opcode.parameters.front() - 1;
if (!extendIfNecessary(filters, filterIndex + 1, Default::numFilters)) if (!extendIfNecessary(filters, filterIndex + 1, Default::numFilters))

5
tests/OpcodeT.cpp
View file

@ -233,6 +233,11 @@ TEST_CASE("[Opcode] Normalization")
{"cutoff_foobar", "cutoff1_foobar"}, {"cutoff_foobar", "cutoff1_foobar"},
{"resonance", "resonance1"}, {"resonance", "resonance1"},
{"resonance_foobar", "resonance1_foobar"}, {"resonance_foobar", "resonance1_foobar"},
// Cakewalk aliases
{"cutoff_random", "fil1_random"},
{"cutoff1_random", "fil1_random"},
{"cutoff2_random", "fil2_random"},
{"gain_random", "amp_random"},
}; };
for (auto pair : regionSpecific) { for (auto pair : regionSpecific) {