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

Added the volumeCC parsing and proper range

Browse source
This commit is contained in:
Paul Ferrand 2019-12-29 12:18:39 +01:00
parent f9763c0058
commit 1c2d8f4399
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/Defaults.h
View file

@ -87,7 +87,7 @@ namespace Default
// Performance parameters: amplifier // Performance parameters: amplifier
constexpr float volume { -3.0 }; constexpr float volume { -3.0 };
constexpr Range<float> volumeRange { -144.0, 6.0 }; constexpr Range<float> volumeRange { -144.0, 6.0 };
constexpr Range<float> volumeCCRange { -144.0, 6.0 }; constexpr Range<float> volumeCCRange { -144.0, 48.0 };
constexpr float amplitude { 100.0 }; constexpr float amplitude { 100.0 };
constexpr Range<float> amplitudeRange { 0.0, 100.0 }; constexpr Range<float> amplitudeRange { 0.0, 100.0 };
constexpr float pan { 0.0 }; constexpr float pan { 0.0 };

9
src/sfizz/Region.cpp
View file

@ -260,10 +260,11 @@ bool sfz::Region::parseOpcode(const Opcode& opcode)
case hash("volume"): case hash("volume"):
setValueFromOpcode(opcode, volume, Default::volumeRange); setValueFromOpcode(opcode, volume, Default::volumeRange);
break; break;
// case hash("volume_oncc"): case hash("gain_cc"):
// if (opcode.parameter) case hash("gain_oncc"):
// setValueFromOpcode(opcode, volumeCCTriggers[*opcode.parameter], Default::volumeCCRange); case hash("volume_oncc"):
// break; setCCPairFromOpcode(opcode, volumeCC, Default::volumeCCRange);
break;
case hash("amplitude"): case hash("amplitude"):
setValueFromOpcode(opcode, amplitude, Default::amplitudeRange); setValueFromOpcode(opcode, amplitude, Default::amplitudeRange);
break; break;