diff --git a/src/sfizz/Defaults.h b/src/sfizz/Defaults.h index 4d01301c..3f53ecc3 100644 --- a/src/sfizz/Defaults.h +++ b/src/sfizz/Defaults.h @@ -206,5 +206,10 @@ namespace Default constexpr bool checkSostenuto { true }; // sostenuto_sw constexpr Range octaveOffsetRange { -10, 10 }; // octave_offset constexpr Range noteOffsetRange { -127, 127 }; // note_offset + + constexpr Range apanWaveformRange { 0, std::numeric_limits::max() }; + constexpr Range apanFrequencyRange { 0, std::numeric_limits::max() }; + constexpr Range apanPhaseRange { 0.0, 360.0 }; + constexpr Range apanLevelRange { 0.0, 100.0 }; } } diff --git a/src/sfizz/effects/Apan.cpp b/src/sfizz/effects/Apan.cpp index 7b370c1e..bac37e74 100644 --- a/src/sfizz/effects/Apan.cpp +++ b/src/sfizz/effects/Apan.cpp @@ -80,30 +80,30 @@ namespace fx { for (const Opcode& opc : members) { switch (opc.lettersOnlyHash) { case hash("apan_waveform"): - if (auto value = readOpcode(opc.value, Range { 0, std::numeric_limits::max() })) + if (auto value = readOpcode(opc.value, Default::apanWaveformRange)) fx->_lfoWave = *value; break; case hash("apan_freq"): - if (auto value = readOpcode(opc.value, Range { 0.0, std::numeric_limits::max() })) + if (auto value = readOpcode(opc.value, Default::apanFrequencyRange)) fx->_lfoFrequency = *value; break; case hash("apan_phase"): - if (auto value = readOpcode(opc.value, Range { 0.0, 360.0 })) { + if (auto value = readOpcode(opc.value, Default::apanPhaseRange)) { float phase = *value / 360.0f; phase -= (int)phase; fx->_lfoPhaseOffset = phase; } break; case hash("apan_dry"): - if (auto value = readOpcode(opc.value, Range { 0.0, 100.0 })) + if (auto value = readOpcode(opc.value, Default::apanLevelRange)) fx->_dry = *value / 100.0f; break; case hash("apan_wet"): - if (auto value = readOpcode(opc.value, Range { 0.0, 100.0 })) + if (auto value = readOpcode(opc.value, Default::apanLevelRange)) fx->_wet = *value / 100.0f; break; case hash("apan_depth"): - if (auto value = readOpcode(opc.value, Range { 0.0, 100.0 })) + if (auto value = readOpcode(opc.value, Default::apanLevelRange)) fx->_depth = *value / 100.0f; break; }