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

Properly set the initial value for the smoothers

Browse source 
Take into account the curve
This commit is contained in:
Paul Ferrand 2020-07-01 14:14:45 +02:00
parent d8d956562e
commit ae0ac8d632
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/sfizz/Voice.cpp
View file

@ -136,21 +136,24 @@ void sfz::Voice::startVoice(Region* region, int delay, int number, float value,
for (auto& modId : allModifiers) { for (auto& modId : allModifiers) {
ASSERT(modifierSmoothers[modId].size() >= region->modifiers[modId].size()); ASSERT(modifierSmoothers[modId].size() >= region->modifiers[modId].size());
forEachWithSmoother(modId, [modId, this](const CCData<Modifier>& mod, Smoother& smoother) { forEachWithSmoother(modId, [modId, this](const CCData<Modifier>& mod, Smoother& smoother) {
const auto ccValue = resources.midiState.getCCValue(mod.cc);
const auto curve = resources.curves.getCurve(mod.data.curve);
const auto finalValue = curve.evalNormalized(ccValue) * mod.data.value;
switch (modId) { switch (modId) {
case Mod::volume: case Mod::volume:
smoother.reset(db2mag(resources.midiState.getCCValue(mod.cc) * mod.data.value)); smoother.reset(db2mag(finalValue));
break; break;
case Mod::pitch: case Mod::pitch:
smoother.reset(centsFactor(resources.midiState.getCCValue(mod.cc) * mod.data.value)); smoother.reset(centsFactor(finalValue));
break; break;
case Mod::amplitude: case Mod::amplitude:
case Mod::pan: case Mod::pan:
case Mod::width: case Mod::width:
case Mod::position: case Mod::position:
smoother.reset(normalizePercents(resources.midiState.getCCValue(mod.cc) * mod.data.value)); smoother.reset(normalizePercents(finalValue));
break; break;
default: default:
smoother.reset(resources.midiState.getCCValue(mod.cc) * mod.data.value); smoother.reset(finalValue);
break; break;
} }
smoother.setSmoothing(mod.data.smooth, sampleRate); smoother.setSmoothing(mod.data.smooth, sampleRate);