From ae0ac8d63243354299c3be3438c45115e21b9139 Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Wed, 1 Jul 2020 14:14:45 +0200
Subject: [PATCH] Properly set the initial value for the smoothers Take into
 account the curve

---
 src/sfizz/Voice.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp
index 66a46d99..df3a46b6 100644
--- a/src/sfizz/Voice.cpp
+++ b/src/sfizz/Voice.cpp
@@ -136,21 +136,24 @@ void sfz::Voice::startVoice(Region* region, int delay, int number, float value,
     for (auto& modId : allModifiers) {
         ASSERT(modifierSmoothers[modId].size() >= region->modifiers[modId].size());
         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) {
             case Mod::volume:
-                smoother.reset(db2mag(resources.midiState.getCCValue(mod.cc) * mod.data.value));
+                smoother.reset(db2mag(finalValue));
                 break;
             case Mod::pitch:
-                smoother.reset(centsFactor(resources.midiState.getCCValue(mod.cc) * mod.data.value));
+                smoother.reset(centsFactor(finalValue));
                 break;
             case Mod::amplitude:
             case Mod::pan:
             case Mod::width:
             case Mod::position:
-                smoother.reset(normalizePercents(resources.midiState.getCCValue(mod.cc) * mod.data.value));
+                smoother.reset(normalizePercents(finalValue));
                 break;
             default:
-                smoother.reset(resources.midiState.getCCValue(mod.cc) * mod.data.value);
+                smoother.reset(finalValue);
                 break;
             }
             smoother.setSmoothing(mod.data.smooth, sampleRate);