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

Merge pull request #441 from jpcima/consistency

Browse source 
Rename extended opcode for consistency
This commit is contained in:
JP Cimalando 2020-09-27 19:09:20 +02:00 • committed by GitHub
commit 143bec0c24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sfizz/Region.cpp
View file

@ -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"):
@ -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"):

4
tests/ModulationsT.cpp
View file

@ -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();