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

Moved the verification ranges to Defaults.h

Browse source
This commit is contained in:
Paul Fd 2020-03-14 23:04:14 +01:00
parent 620dbb9380
commit 20f2f59a0b
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/sfizz/Defaults.h
View file

@ -206,5 +206,10 @@ namespace Default
constexpr bool checkSostenuto { true }; // sostenuto_sw
constexpr Range<int> octaveOffsetRange { -10, 10 }; // octave_offset
constexpr Range<int> noteOffsetRange { -127, 127 }; // note_offset
constexpr Range<int> apanWaveformRange { 0, std::numeric_limits<int>::max() };
constexpr Range<float> apanFrequencyRange { 0, std::numeric_limits<float>::max() };
constexpr Range<float> apanPhaseRange { 0.0, 360.0 };
constexpr Range<float> apanLevelRange { 0.0, 100.0 };
}
}

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

@ -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<int> { 0, std::numeric_limits<int>::max() }))
if (auto value = readOpcode(opc.value, Default::apanWaveformRange))
fx->_lfoWave = *value;
break;
case hash("apan_freq"):
if (auto value = readOpcode(opc.value, Range<float> { 0.0, std::numeric_limits<float>::max() }))
if (auto value = readOpcode(opc.value, Default::apanFrequencyRange))
fx->_lfoFrequency = *value;
break;
case hash("apan_phase"):
if (auto value = readOpcode(opc.value, Range<float> { 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<float> { 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<float> { 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<float> { 0.0, 100.0 }))
if (auto value = readOpcode(opc.value, Default::apanLevelRange))
fx->_depth = *value / 100.0f;
break;
}