zynaddsubfx

commit c3bcb54fdc2563d32c071ba59d8d618f67dd7ed6
parent 4932a6e882b2f18ac320d1c8908b71b21aa60d7a
Author: Ricard Wanderlof <polluxsynth@butoba.net>
Date:   Sat,  5 Mar 2022 23:52:44 +0100

Update mod amount when depth/exp changed (#345)

When modwheel.depth or modwheel.exponential is changed, update the
modulation amount directly, rather than only when a new modwheel
value is received. This results in a more positive user experience,
otherwise it seems like changing the depth or exponential
parameters does not have any immediate effect.

Diffstat:
M
src/Params/Controller.cpp
 | 
14
+++++++++++++-
M
src/Params/Controller.h
 | 
1
+

2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/Params/Controller.cpp b/src/Params/Controller.cpp
@@ -26,8 +26,10 @@ namespace zyn {
 
 #define rObject Controller
 
+#define rChangeCbBase if (obj->time) { obj->last_update_timestamp = obj->time->time(); }
+
 #undef rChangeCb
-#define rChangeCb if (obj->time) { obj->last_update_timestamp = obj->time->time(); }
+#define rChangeCb rChangeCbBase
 const rtosc::Ports Controller::ports = {
     rParamZyn(panning.depth,       rShort("pan.d"), rDefault(64),
         "Depth of Panning MIDI Control"),
@@ -39,10 +41,14 @@ const rtosc::Ports Controller::ports = {
         "Depth of Bandwidth MIDI Control"),
     rToggle(bandwidth.exponential, rShort("bw.exp"), rDefault(false),
         "Bandwidth Exponential Mode"),
+#undef rChangeCb
+#define rChangeCb obj->setmodwheel(); rChangeCbBase
     rParamZyn(modwheel.depth,      rShort("mdw.d"), rDefault(80),
         "Depth of Modwheel MIDI Control"),
     rToggle(modwheel.exponential,  rShort("mdw.exp"), rDefault(false),
         "Modwheel Exponential Mode"),
+#undef rChangeCb
+#define rChangeCb rChangeCbBase
     rToggle(pitchwheel.is_split,   rDefault(false),
         "If PitchWheel has unified bendrange or not"),
     rParamI(pitchwheel.bendrange,  rShort("pch.d"), rDefault(200),
@@ -216,6 +222,12 @@ void Controller::setbandwidth(int value)
 void Controller::setmodwheel(int value)
 {
     modwheel.data = value;
+    setmodwheel();
+}
+
+void Controller::setmodwheel(void)
+{
+    int value = modwheel.data;
     if(modwheel.exponential == 0) {
         float tmp =
             powf(25.0f, powf(modwheel.depth / 127.0f, 1.5f) * 2.0f) / 25.0f;
diff --git a/src/Params/Controller.h b/src/Params/Controller.h
@@ -40,6 +40,7 @@ class Controller
         void setfilterq(int value);
         void setbandwidth(int value);
         void setmodwheel(int value);
+        void setmodwheel(void);
         void setfmamp(int value);
         void setvolume(int value);
         void setsustain(int value);