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

Fix fverb parameters corrupted in opcode spec work

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-02-25 01:24:10 +01:00
parent 58c7c38f2e
commit dc16470dda
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/sfizz/Defaults.cpp
View file

@ -131,6 +131,7 @@ extern const OpcodeSpec<int> sampleQuality { 1, Range<int>(1, 10), 0 };
extern const OpcodeSpec<int> octaveOffset { 0, Range<int>(-10, 10), 0 }; extern const OpcodeSpec<int> octaveOffset { 0, Range<int>(-10, 10), 0 };
extern const OpcodeSpec<int> noteOffset { 0, Range<int>(-127, 127), 0 }; extern const OpcodeSpec<int> noteOffset { 0, Range<int>(-127, 127), 0 };
extern const OpcodeSpec<float> effect { 0.0f, Range<float>(0.0f, 100.0f), kNormalizePercent }; extern const OpcodeSpec<float> effect { 0.0f, Range<float>(0.0f, 100.0f), kNormalizePercent };
extern const OpcodeSpec<float> effectPercent { 0.0f, Range<float>(0.0f, 100.0f), 0 };
extern const OpcodeSpec<int> apanWaveform { 0, Range<int>(0, std::numeric_limits<int>::max()), 0 }; extern const OpcodeSpec<int> apanWaveform { 0, Range<int>(0, std::numeric_limits<int>::max()), 0 };
extern const OpcodeSpec<float> apanFrequency { 0.0f, Range<float>(0.0f, std::numeric_limits<float>::max()), 0 }; extern const OpcodeSpec<float> apanFrequency { 0.0f, Range<float>(0.0f, std::numeric_limits<float>::max()), 0 };
extern const OpcodeSpec<float> apanPhase { 0.5f, Range<float>(0.0f, 1.0f), kWrapPhase }; extern const OpcodeSpec<float> apanPhase { 0.5f, Range<float>(0.0f, 1.0f), kWrapPhase };

1
src/sfizz/Defaults.h
View file

@ -250,6 +250,7 @@ namespace Default
extern const OpcodeSpec<int> octaveOffset; extern const OpcodeSpec<int> octaveOffset;
extern const OpcodeSpec<int> noteOffset; extern const OpcodeSpec<int> noteOffset;
extern const OpcodeSpec<float> effect; extern const OpcodeSpec<float> effect;
extern const OpcodeSpec<float> effectPercent;
extern const OpcodeSpec<int> apanWaveform; extern const OpcodeSpec<int> apanWaveform;
extern const OpcodeSpec<float> apanFrequency; extern const OpcodeSpec<float> apanFrequency;
extern const OpcodeSpec<float> apanPhase; extern const OpcodeSpec<float> apanPhase;

12
src/sfizz/effects/Fverb.cpp
View file

@ -173,9 +173,9 @@ namespace fx {
std::unique_ptr<Effect> fx { reverb }; std::unique_ptr<Effect> fx { reverb };
const Impl::Profile* profile = &Impl::largeHall; const Impl::Profile* profile = &Impl::largeHall;
float dry { Default::effect }; float dry { Default::effectPercent };
float wet { Default::effect }; float wet { Default::effectPercent };
float input { Default::effect }; float input { Default::effectPercent };
float size { Default::fverbSize }; float size { Default::fverbSize };
float predelay { Default::fverbPredelay }; float predelay { Default::fverbPredelay };
float tone { Default::fverbTone }; float tone { Default::fverbTone };
@ -205,13 +205,13 @@ namespace fx {
break; break;
case hash("reverb_dry"): case hash("reverb_dry"):
dry = opc.read(Default::effect); dry = opc.read(Default::effectPercent);
break; break;
case hash("reverb_wet"): case hash("reverb_wet"):
wet = opc.read(Default::effect); wet = opc.read(Default::effectPercent);
break; break;
case hash("reverb_input"): case hash("reverb_input"):
input = opc.read(Default::effect); input = opc.read(Default::effectPercent);
break; break;
case hash("reverb_size"): case hash("reverb_size"):
size = opc.read(Default::fverbSize); size = opc.read(Default::fverbSize);