From dc16470dda8d0738a6f57678e7f579fa3a3ee5c3 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Thu, 25 Feb 2021 01:24:10 +0100 Subject: [PATCH] Fix fverb parameters corrupted in opcode spec work --- src/sfizz/Defaults.cpp | 1 + src/sfizz/Defaults.h | 1 + src/sfizz/effects/Fverb.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/sfizz/Defaults.cpp b/src/sfizz/Defaults.cpp index 7a53d54d..792983ff 100644 --- a/src/sfizz/Defaults.cpp +++ b/src/sfizz/Defaults.cpp @@ -131,6 +131,7 @@ extern const OpcodeSpec sampleQuality { 1, Range(1, 10), 0 }; extern const OpcodeSpec octaveOffset { 0, Range(-10, 10), 0 }; extern const OpcodeSpec noteOffset { 0, Range(-127, 127), 0 }; extern const OpcodeSpec effect { 0.0f, Range(0.0f, 100.0f), kNormalizePercent }; +extern const OpcodeSpec effectPercent { 0.0f, Range(0.0f, 100.0f), 0 }; extern const OpcodeSpec apanWaveform { 0, Range(0, std::numeric_limits::max()), 0 }; extern const OpcodeSpec apanFrequency { 0.0f, Range(0.0f, std::numeric_limits::max()), 0 }; extern const OpcodeSpec apanPhase { 0.5f, Range(0.0f, 1.0f), kWrapPhase }; diff --git a/src/sfizz/Defaults.h b/src/sfizz/Defaults.h index 289b8d7d..f778e09e 100644 --- a/src/sfizz/Defaults.h +++ b/src/sfizz/Defaults.h @@ -250,6 +250,7 @@ namespace Default extern const OpcodeSpec octaveOffset; extern const OpcodeSpec noteOffset; extern const OpcodeSpec effect; + extern const OpcodeSpec effectPercent; extern const OpcodeSpec apanWaveform; extern const OpcodeSpec apanFrequency; extern const OpcodeSpec apanPhase; diff --git a/src/sfizz/effects/Fverb.cpp b/src/sfizz/effects/Fverb.cpp index 804e12a3..5d0bb14f 100644 --- a/src/sfizz/effects/Fverb.cpp +++ b/src/sfizz/effects/Fverb.cpp @@ -173,9 +173,9 @@ namespace fx { std::unique_ptr fx { reverb }; const Impl::Profile* profile = &Impl::largeHall; - float dry { Default::effect }; - float wet { Default::effect }; - float input { Default::effect }; + float dry { Default::effectPercent }; + float wet { Default::effectPercent }; + float input { Default::effectPercent }; float size { Default::fverbSize }; float predelay { Default::fverbPredelay }; float tone { Default::fverbTone }; @@ -205,13 +205,13 @@ namespace fx { break; case hash("reverb_dry"): - dry = opc.read(Default::effect); + dry = opc.read(Default::effectPercent); break; case hash("reverb_wet"): - wet = opc.read(Default::effect); + wet = opc.read(Default::effectPercent); break; case hash("reverb_input"): - input = opc.read(Default::effect); + input = opc.read(Default::effectPercent); break; case hash("reverb_size"): size = opc.read(Default::fverbSize);