From 766b84cfa52d637e630905969fcaf89fc892ae73 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Fri, 25 Sep 2020 17:18:05 +0200 Subject: [PATCH 1/3] Rename extended opcode for consistency --- src/sfizz/Region.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index a98dac2a..b78a38d0 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -1057,7 +1057,7 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode) case hash("lfo&_resonance&"): LFO_EG_filter_EQ_target(ModId::LFO, ModId::FilResonance, Default::filterResonanceModRange); break; - case hash("lfo&_fil&_gain"): + case hash("lfo&_fil&gain"): LFO_EG_filter_EQ_target(ModId::LFO, ModId::FilGain, Default::filterGainModRange); break; case hash("lfo&_eq&gain"): From 8f12dd1c5e0d249b1637ed37c3f40a16e7b64e8c Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Fri, 25 Sep 2020 19:08:53 +0200 Subject: [PATCH 2/3] Same with egN_filXgain --- src/sfizz/Region.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index b78a38d0..23e6be98 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -1149,7 +1149,7 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode) case hash("eg&_resonance&"): LFO_EG_filter_EQ_target(ModId::Envelope, ModId::FilResonance, Default::filterResonanceModRange); break; - case hash("eg&_fil&_gain"): + case hash("eg&_fil&gain"): LFO_EG_filter_EQ_target(ModId::Envelope, ModId::FilGain, Default::filterGainModRange); break; case hash("eg&_eq&gain"): From 3a584481c68490eb48ced97b123ccd0ba866425f Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Fri, 25 Sep 2020 19:09:01 +0200 Subject: [PATCH 3/3] Update tests --- tests/ModulationsT.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ModulationsT.cpp b/tests/ModulationsT.cpp index 45db5737..05136501 100644 --- a/tests/ModulationsT.cpp +++ b/tests/ModulationsT.cpp @@ -146,7 +146,7 @@ TEST_CASE("[Modulations] LFO Filter connections") lfo3_freq=2 lfo3_resonance=3 lfo4_freq=0.5 lfo4_resonance1=4 lfo5_freq=0.5 lfo5_resonance2=5 - lfo6_freq=3 lfo6_fil1_gain=-1 + lfo6_freq=3 lfo6_fil1gain=-1 )"); const std::string graph = synth.getResources().modMatrix.toDotGraph(); @@ -170,7 +170,7 @@ TEST_CASE("[Modulations] EG Filter connections") eg3_time1=2 eg3_resonance=3 eg4_time1=0.5 eg4_resonance1=4 eg5_time1=0.5 eg5_resonance2=5 - eg6_time1=3 eg6_fil1_gain=-1 + eg6_time1=3 eg6_fil1gain=-1 )"); const std::string graph = synth.getResources().modMatrix.toDotGraph();