diff --git a/src/sfizz/Defaults.h b/src/sfizz/Defaults.h index d4ff78ec..9df5faed 100644 --- a/src/sfizz/Defaults.h +++ b/src/sfizz/Defaults.h @@ -87,7 +87,7 @@ namespace Default // Performance parameters: amplifier constexpr float volume { -3.0 }; constexpr Range volumeRange { -144.0, 6.0 }; - constexpr Range volumeCCRange { -144.0, 6.0 }; + constexpr Range volumeCCRange { -144.0, 48.0 }; constexpr float amplitude { 100.0 }; constexpr Range amplitudeRange { 0.0, 100.0 }; constexpr float pan { 0.0 }; diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index 42bc0d08..0a44dacd 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -260,10 +260,11 @@ bool sfz::Region::parseOpcode(const Opcode& opcode) case hash("volume"): setValueFromOpcode(opcode, volume, Default::volumeRange); break; - // case hash("volume_oncc"): - // if (opcode.parameter) - // setValueFromOpcode(opcode, volumeCCTriggers[*opcode.parameter], Default::volumeCCRange); - // break; + case hash("gain_cc"): + case hash("gain_oncc"): + case hash("volume_oncc"): + setCCPairFromOpcode(opcode, volumeCC, Default::volumeCCRange); + break; case hash("amplitude"): setValueFromOpcode(opcode, amplitude, Default::amplitudeRange); break;