Rework global param def, always have bypass, reverb lpf checkbox

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Jan 15, 2023 · 8dd2ab8 · 8dd2ab8
1 parent 5867b61
commit 8dd2ab8
Show file tree

Hide file tree

Showing 26 changed files with 180 additions and 162 deletions.
diff --git a/dpf b/dpf
diff --git a/dpf-widgets b/dpf-widgets
diff --git a/plugins/AB-InputSelector/DistrhoPluginInfo.h b/plugins/AB-InputSelector/DistrhoPluginInfo.h
@@ -33,6 +33,7 @@
 enum Parameters {
     kParameterSelect,
     kParameterMode,
+    kParameterBypass,
     kParameterCount
 };
 
@@ -45,7 +46,10 @@ enum States {
     kStateCount
 };
 
-static const float kParameterDefaults[kParameterCount] = {
-    0.0f,
-    0.0f
+static constexpr const struct OneKnobParameterRanges {
+    float min, def, max;
+} kParameterRanges[kParameterCount] = {
+    { -100.f, 0.f, 100.f },
+    { 0.f, 0.f, 1.f },
+    {}
 };
diff --git a/plugins/AB-InputSelector/OneKnobPlugin.cpp b/plugins/AB-InputSelector/OneKnobPlugin.cpp
@@ -69,19 +69,19 @@ class OneKnobInputSelectorPlugin : public OneKnobPlugin
             parameter.name       = "A/B Select";
             parameter.symbol     = "select";
             parameter.unit       = "%";
-            parameter.ranges.def = kParameterDefaults[kParameterSelect];
-            parameter.ranges.min = -100.0f;
-            parameter.ranges.max = 100.0f;
+            parameter.ranges.def = kParameterRanges[kParameterSelect].def;
+            parameter.ranges.min = kParameterRanges[kParameterSelect].min;
+            parameter.ranges.max = kParameterRanges[kParameterSelect].max;
             {
                 ParameterEnumerationValue *values = new ParameterEnumerationValue[3];
                 parameter.enumValues.values = values;
                 parameter.enumValues.count = 3;
                 parameter.enumValues.restrictedMode = false;
-                values[0].value = -100.0f;
+                values[0].value = kParameterRanges[kParameterSelect].min;
                 values[0].label = "A";
-                values[1].value = 0.0f;
+                values[1].value = kParameterRanges[kParameterSelect].def;
                 values[1].label = "A/B";
-                values[2].value = 100.0f;
+                values[2].value = kParameterRanges[kParameterSelect].max;
                 values[2].label = "B";
             }
             break;
@@ -90,9 +90,12 @@ class OneKnobInputSelectorPlugin : public OneKnobPlugin
             parameter.name       = "Mode";
             parameter.symbol     = "mode";
             parameter.unit       = "";
-            parameter.ranges.def = kParameterDefaults[kParameterMode];
-            parameter.ranges.min = 0.0f;
-            parameter.ranges.max = 1.0f;
+            parameter.ranges.def = kParameterRanges[kParameterMode].def;
+            parameter.ranges.min = kParameterRanges[kParameterMode].min;
+            parameter.ranges.max = kParameterRanges[kParameterMode].max;
+            break;
+        case kParameterBypass:
+            parameter.initDesignation(kParameterDesignationBypass);
             break;
         }
     }

diff --git a/plugins/AB-InputSelector/OneKnobUI.cpp b/plugins/AB-InputSelector/OneKnobUI.cpp
@@ -31,17 +31,14 @@ static const OneKnobMainControl main = {
     kParameterSelect,
     "A/B Select",
     "%",
-    -100.0f,
-    100.0f,
-    0.0f
 };
 
 static const OneKnobAuxiliaryComboBoxValue comboBoxValues[] = {
     {
         0, "Mode 1", "Explain mode 1"
     },
     {
-        0, "Mode 2", "Explain mode 2"
+        1, "Mode 2", "Explain mode 2"
     },
 };
 
@@ -105,8 +102,8 @@ class OneKnobInputSelectorUI : public OneKnobUI
         switch (index)
         {
         case kProgramInit:
-            setMainControlValue(kParameterDefaults[kParameterSelect]);
-            setAuxiliaryComboBoxValue(kParameterDefaults[kParameterMode]);
+            setMainControlValue(kParameterRanges[kParameterSelect].def);
+            setAuxiliaryComboBoxValue(kParameterRanges[kParameterMode].def);
             break;
         }
 

diff --git a/plugins/AB-OutputSelector/DistrhoPluginInfo.h b/plugins/AB-OutputSelector/DistrhoPluginInfo.h
@@ -33,6 +33,7 @@
 enum Parameters {
     kParameterSelect,
     kParameterMode,
+    kParameterBypass,
     kParameterCount
 };
 
@@ -45,7 +46,10 @@ enum States {
     kStateCount
 };
 
-static const float kParameterDefaults[kParameterCount] = {
-    0.0f,
-    0.0f
+static constexpr const struct OneKnobParameterRanges {
+    float min, def, max;
+} kParameterRanges[kParameterCount] = {
+    { -100.f, 0.f, 100.f },
+    { 0.f, 0.f, 1.f },
+    {}
 };
diff --git a/plugins/AB-OutputSelector/OneKnobPlugin.cpp b/plugins/AB-OutputSelector/OneKnobPlugin.cpp
@@ -69,19 +69,19 @@ class OneKnobOutputSelectorPlugin : public OneKnobPlugin
             parameter.name       = "A/B Select";
             parameter.symbol     = "select";
             parameter.unit       = "%";
-            parameter.ranges.def = kParameterDefaults[kParameterSelect];
-            parameter.ranges.min = -100.0f;
-            parameter.ranges.max = 100.0f;
+            parameter.ranges.def = kParameterRanges[kParameterSelect].def;
+            parameter.ranges.min = kParameterRanges[kParameterSelect].min;
+            parameter.ranges.max = kParameterRanges[kParameterSelect].max;
             {
                 ParameterEnumerationValue *values = new ParameterEnumerationValue[3];
                 parameter.enumValues.values = values;
                 parameter.enumValues.count = 3;
                 parameter.enumValues.restrictedMode = false;
-                values[0].value = -100.0f;
+                values[0].value = kParameterRanges[kParameterSelect].min;
                 values[0].label = "A";
-                values[1].value = 0.0f;
+                values[1].value = kParameterRanges[kParameterSelect].def;
                 values[1].label = "A/B";
-                values[2].value = 100.0f;
+                values[2].value = kParameterRanges[kParameterSelect].max;
                 values[2].label = "B";
             }
             break;
@@ -90,9 +90,12 @@ class OneKnobOutputSelectorPlugin : public OneKnobPlugin
             parameter.name       = "Mode";
             parameter.symbol     = "mode";
             parameter.unit       = "";
-            parameter.ranges.def = kParameterDefaults[kParameterMode];
-            parameter.ranges.min = 0.0f;
-            parameter.ranges.max = 1.0f;
+            parameter.ranges.def = kParameterRanges[kParameterMode].def;
+            parameter.ranges.min = kParameterRanges[kParameterMode].min;
+            parameter.ranges.max = kParameterRanges[kParameterMode].max;
+            break;
+        case kParameterBypass:
+            parameter.initDesignation(kParameterDesignationBypass);
             break;
         }
     }

diff --git a/plugins/AB-OutputSelector/OneKnobUI.cpp b/plugins/AB-OutputSelector/OneKnobUI.cpp
@@ -31,17 +31,14 @@ static const OneKnobMainControl main = {
     kParameterSelect,
     "A/B Select",
     "%",
-    -100.0f,
-    100.0f,
-    0.0f
 };
 
 static const OneKnobAuxiliaryComboBoxValue comboBoxValues[] = {
     {
         0, "Mode 1", "Explain mode 1"
     },
     {
-        0, "Mode 2", "Explain mode 2"
+        1, "Mode 2", "Explain mode 2"
     },
 };
 
@@ -105,8 +102,8 @@ class OneKnobOutputSelectorUI : public OneKnobUI
         switch (index)
         {
         case kProgramInit:
-            setMainControlValue(kParameterDefaults[kParameterSelect]);
-            setAuxiliaryComboBoxValue(kParameterDefaults[kParameterMode]);
+            setMainControlValue(kParameterRanges[kParameterSelect].def);
+            setAuxiliaryComboBoxValue(kParameterRanges[kParameterMode].def);
             break;
         }
 

diff --git a/plugins/BrickwallLimiter/DistrhoPluginInfo.h b/plugins/BrickwallLimiter/DistrhoPluginInfo.h
@@ -30,6 +30,7 @@
 enum Parameters {
     kParameterThreshold,
     kParameterAutoGain,
+    kParameterBypass,
     kParameterCount
 };
 
@@ -49,3 +50,10 @@ static const float kParameterDefaults[kParameterCount] = {
     0.0f,
     1.0f
 };
+
+static constexpr const struct OneKnobParameterRanges {
+    float min, def, max;
+} kParameterRanges[kParameterCount] = {
+    { },
+    {}
+};
diff --git a/plugins/BrickwallLimiter/OneKnobPlugin.cpp b/plugins/BrickwallLimiter/OneKnobPlugin.cpp
@@ -89,7 +89,9 @@ class OneKnobBrickwallLimiterPlugin : public OneKnobPlugin
             parameter.name       = "Threshold";
             parameter.symbol     = "threshold";
             parameter.unit       = "dB";
-            parameter.ranges.def = kParameterDefaults[kParameterThreshold];
+            parameter.ranges.def = kParameterRanges[kParameterThreshold].def;
+            parameter.ranges.min = kParameterRanges[kParameterThreshold].min;
+            parameter.ranges.max = kParameterRanges[kParameterThreshold].max;
             parameter.ranges.min = -50.0f;
             parameter.ranges.max = 0.0f;
             break;
@@ -98,10 +100,15 @@ class OneKnobBrickwallLimiterPlugin : public OneKnobPlugin
             parameter.name       = "Auto-Gain";
             parameter.symbol     = "autogain";
             parameter.unit       = "";
-            parameter.ranges.def = kParameterDefaults[kParameterAutoGain];
+            parameter.ranges.def = kParameterRanges[kParameterAutoGain].def;
+            parameter.ranges.min = kParameterRanges[kParameterAutoGain].min;
+            parameter.ranges.max = kParameterRanges[kParameterAutoGain].max;
             parameter.ranges.min = 0.0f;
             parameter.ranges.max = 1.0f;
             break;
+        case kParameterBypass:
+            parameter.initDesignation(kParameterDesignationBypass);
+            break;
         }
     }
 

diff --git a/plugins/BrickwallLimiter/OneKnobUI.cpp b/plugins/BrickwallLimiter/OneKnobUI.cpp
@@ -31,9 +31,6 @@ static const OneKnobMainControl main = {
     kParameterThreshold,
     "Threshold",
     "dB",
-    -50.0f,
-    0.0f,
-    0.0f
 };
 
 static const OneKnobAuxiliaryCheckBox checkBox = {
@@ -93,8 +90,8 @@ class OneKnobBrickwallLimiterUI : public OneKnobUI
         switch (index)
         {
         case kProgramInit:
-            setMainControlValue(kParameterDefaults[kParameterThreshold]);
-            setAuxiliaryCheckBoxValue(kParameterDefaults[kParameterAutoGain]);
+            setMainControlValue(kParameterRanges[kParameterThreshold].def);
+            setAuxiliaryCheckBoxValue(kParameterRanges[kParameterAutoGain].def);
             break;
         case kProgramGentle:
             break;

diff --git a/plugins/Compressor/DistrhoPluginInfo.h b/plugins/Compressor/DistrhoPluginInfo.h
@@ -30,6 +30,7 @@
 enum Parameters {
     kParameterRelease = 0,
     kParameterMode,
+    kParameterBypass,
     kParameterCount
 };
 
@@ -45,7 +46,10 @@ enum States {
     kStateCount
 };
 
-static const float kParameterDefaults[kParameterCount] = {
-    100.0f,
-    2.0f
+static constexpr const struct OneKnobParameterRanges {
+    float min, def, max;
+} kParameterRanges[kParameterCount] = {
+    { 50.f, 100.f, 500.f },
+    { 0.f, 2.f, 3.f },
+    {}
 };
diff --git a/plugins/Compressor/OneKnobPlugin.cpp b/plugins/Compressor/OneKnobPlugin.cpp
@@ -68,18 +68,18 @@ class OneKnobCompressorPlugin : public OneKnobPlugin
             parameter.name       = "Release";
             parameter.symbol     = "release";
             parameter.unit       = "ms";
-            parameter.ranges.def = kParameterDefaults[kParameterRelease];
-            parameter.ranges.min = 50.0f;
-            parameter.ranges.max = 500.0f;
+            parameter.ranges.def = kParameterRanges[kParameterRelease].def;
+            parameter.ranges.min = kParameterRanges[kParameterRelease].min;
+            parameter.ranges.max = kParameterRanges[kParameterRelease].max;
             break;
         case kParameterMode:
             parameter.hints      = kParameterIsAutomatable | kParameterIsInteger;
             parameter.name       = "Mode";
             parameter.symbol     = "mode";
             parameter.unit       = "";
-            parameter.ranges.def = kParameterDefaults[kParameterMode];
-            parameter.ranges.min = 0.0f;
-            parameter.ranges.max = 3.0f;
+            parameter.ranges.def = kParameterRanges[kParameterMode].def;
+            parameter.ranges.min = kParameterRanges[kParameterMode].min;
+            parameter.ranges.max = kParameterRanges[kParameterMode].max;
             if (ParameterEnumerationValue* const values = new ParameterEnumerationValue[4])
             {
               parameter.enumValues.count = 4;
@@ -96,6 +96,9 @@ class OneKnobCompressorPlugin : public OneKnobPlugin
               values[3].value = 3.0f;
             }
             break;
+        case kParameterBypass:
+            parameter.initDesignation(kParameterDesignationBypass);
+            break;
         }
     }
 
@@ -150,9 +153,9 @@ class OneKnobCompressorPlugin : public OneKnobPlugin
             }
 
             compressorOn = mode >= 1 && mode <= 3;
-        }
             break;
         }
+        }
     }
 
     void loadProgram(uint32_t index) override

diff --git a/plugins/Compressor/OneKnobUI.cpp b/plugins/Compressor/OneKnobUI.cpp
@@ -30,9 +30,6 @@ static const OneKnobMainControl main = {
     kParameterRelease,
     "Release",
     "ms",
-    50.0f,
-    500.0f,
-    100.0f
 };
 
 static const OneKnobAuxiliaryComboBoxValue comboBoxValues[] = {
@@ -108,8 +105,8 @@ class OneKnobCompressorUI : public OneKnobUI
         switch (index)
         {
         case kProgramDefault:
-            setMainControlValue(kParameterDefaults[kParameterRelease]);
-            setAuxiliaryComboBoxValue(kParameterDefaults[kParameterMode]);
+            setMainControlValue(kParameterRanges[kParameterRelease].def);
+            setAuxiliaryComboBoxValue(kParameterRanges[kParameterMode].def);
             break;
         case kProgramConservative:
             break;

diff --git a/plugins/ConvolutionReverb/DistrhoPluginInfo.h b/plugins/ConvolutionReverb/DistrhoPluginInfo.h
@@ -53,10 +53,12 @@ enum States {
     kStateCount
 };
 
-static const float kParameterDefaults[kParameterCount] = {
-    0.f,
-    -30.f,
-    0.f,
-    1.f,
-    0.f
+static constexpr const struct OneKnobParameterRanges {
+    float min, def, max;
+} kParameterRanges[kParameterCount] = {
+    { -60.f, 0.f, 0.f },
+    { -60.f, -30.f, 0.f },
+    { 0.f, 0.f, 500.f },
+    { 0.f, 1.f, 1.f },
+    { 0.f, 0.f, 1.f }
 };