Add numeric labels to plugins with break-out widgetlabelknobs

Signed-off-by: Damien Zammit <damien@zamaudio.com>

2 files changed, 42 insertions, 41 deletions

diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp
index 4431098..52bde2e 100644
--- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp
+++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp
@@ -47,7 +47,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     int x = 250;
     int y = 291;
     // knob
-    fKnobAttack1 = new ImageKnob(this, knobImage);
+    fKnobAttack1 = new ZamKnob(this, knobImage);
     fKnobAttack1->setAbsolutePos(26+x, 43+y);
     fKnobAttack1->setRange(0.1f, 200.0f);
     fKnobAttack1->setLabel(true);
@@ -57,7 +57,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobAttack1->setRotationAngle(240);
     fKnobAttack1->setCallback(this);
 
-    fKnobAttack2 = new ImageKnob(this, knobImage);
+    fKnobAttack2 = new ZamKnob(this, knobImage);
     fKnobAttack2->setAbsolutePos(26+x, 43+y-50);
     fKnobAttack2->setRange(0.1f, 200.0f);
     fKnobAttack2->setLabel(true);
@@ -67,7 +67,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobAttack2->setRotationAngle(240);
     fKnobAttack2->setCallback(this);
 
-    fKnobAttack3 = new ImageKnob(this, knobImage);
+    fKnobAttack3 = new ZamKnob(this, knobImage);
     fKnobAttack3->setAbsolutePos(26+x, 43+y-100);
     fKnobAttack3->setRange(0.1f, 200.0f);
     fKnobAttack3->setLabel(true);
@@ -77,7 +77,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobAttack3->setRotationAngle(240);
     fKnobAttack3->setCallback(this);
 
-    fKnobRelease1 = new ImageKnob(this, knobImage);
+    fKnobRelease1 = new ZamKnob(this, knobImage);
     fKnobRelease1->setAbsolutePos(108+x, 43+y);
     fKnobRelease1->setRange(1.0f, 500.0f);
     fKnobRelease1->setLabel(true);
@@ -86,7 +86,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobRelease1->setRotationAngle(240);
     fKnobRelease1->setCallback(this);
 
-    fKnobRelease2 = new ImageKnob(this, knobImage);
+    fKnobRelease2 = new ZamKnob(this, knobImage);
     fKnobRelease2->setAbsolutePos(108+x, 43+y-50);
     fKnobRelease2->setRange(1.0f, 500.0f);
     fKnobRelease2->setLabel(true);
@@ -95,7 +95,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobRelease2->setRotationAngle(240);
     fKnobRelease2->setCallback(this);
 
-    fKnobRelease3 = new ImageKnob(this, knobImage);
+    fKnobRelease3 = new ZamKnob(this, knobImage);
     fKnobRelease3->setAbsolutePos(108+x, 43+y-100);
     fKnobRelease3->setRange(1.0f, 500.0f);
     fKnobRelease3->setLabel(true);
@@ -104,7 +104,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobRelease3->setRotationAngle(240);
     fKnobRelease3->setCallback(this);
 
-    fKnobThresh3 = new ImageKnob(this, knobImage);
+    fKnobThresh3 = new ZamKnob(this, knobImage);
     fKnobThresh3->setAbsolutePos(94.5+31, 99+134);
     fKnobThresh3->setRange(-60.0f, 0.0f);
     fKnobThresh3->setLabel(true);
@@ -113,7 +113,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobThresh3->setRotationAngle(240);
     fKnobThresh3->setCallback(this);
 
-    fKnobThresh2 = new ImageKnob(this, knobImage);
+    fKnobThresh2 = new ZamKnob(this, knobImage);
     fKnobThresh2->setAbsolutePos(94.5+31, 150+134);
     fKnobThresh2->setRange(-60.0f, 0.0f);
     fKnobThresh2->setLabel(true);
@@ -122,7 +122,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobThresh2->setRotationAngle(240);
     fKnobThresh2->setCallback(this);
 
-    fKnobThresh1 = new ImageKnob(this, knobImage);
+    fKnobThresh1 = new ZamKnob(this, knobImage);
     fKnobThresh1->setAbsolutePos(94.5+31, 201+134);
     fKnobThresh1->setRange(-60.0f, 0.0f);
     fKnobThresh1->setLabel(true);
@@ -131,7 +131,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobThresh1->setRotationAngle(240);
     fKnobThresh1->setCallback(this);
 
-    fKnobRatio1 = new ImageKnob(this, knobImage);
+    fKnobRatio1 = new ZamKnob(this, knobImage);
     fKnobRatio1->setAbsolutePos(191.5+x, 43+y);
     fKnobRatio1->setRange(1.0f, 20.0f);
     fKnobRatio1->setLabel(true);
@@ -141,7 +141,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobRatio1->setRotationAngle(240);
     fKnobRatio1->setCallback(this);
 
-    fKnobRatio2 = new ImageKnob(this, knobImage);
+    fKnobRatio2 = new ZamKnob(this, knobImage);
     fKnobRatio2->setAbsolutePos(191.5+x, 43+y-50);
     fKnobRatio2->setRange(1.0f, 20.0f);
     fKnobRatio2->setLabel(true);
@@ -151,7 +151,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobRatio2->setRotationAngle(240);
     fKnobRatio2->setCallback(this);
 
-    fKnobRatio3 = new ImageKnob(this, knobImage);
+    fKnobRatio3 = new ZamKnob(this, knobImage);
     fKnobRatio3->setAbsolutePos(191.5+x, 43+y-100);
     fKnobRatio3->setRange(1.0f, 20.0f);
     fKnobRatio3->setLabel(true);
@@ -161,7 +161,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobRatio3->setRotationAngle(240);
     fKnobRatio3->setCallback(this);
 
-    fKnobKnee1 = new ImageKnob(this, knobImage);
+    fKnobKnee1 = new ZamKnob(this, knobImage);
     fKnobKnee1->setAbsolutePos(273+x, 43+y);
     fKnobKnee1->setRange(0.0f, 8.0f);
     fKnobKnee1->setLabel(true);
@@ -170,7 +170,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobKnee1->setRotationAngle(240);
     fKnobKnee1->setCallback(this);
 
-    fKnobKnee2 = new ImageKnob(this, knobImage);
+    fKnobKnee2 = new ZamKnob(this, knobImage);
     fKnobKnee2->setAbsolutePos(273+x, 43+y-50);
     fKnobKnee2->setRange(0.0f, 8.0f);
     fKnobKnee2->setLabel(true);
@@ -179,7 +179,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobKnee2->setRotationAngle(240);
     fKnobKnee2->setCallback(this);
 
-    fKnobKnee3 = new ImageKnob(this, knobImage);
+    fKnobKnee3 = new ZamKnob(this, knobImage);
     fKnobKnee3->setAbsolutePos(273+x, 43+y-100);
     fKnobKnee3->setRange(0.0f, 8.0f);
     fKnobKnee3->setLabel(true);
@@ -188,7 +188,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobKnee3->setRotationAngle(240);
     fKnobKnee3->setCallback(this);
 
-    fKnobGlobalGain = new ImageKnob(this, knobImage);
+    fKnobGlobalGain = new ZamKnob(this, knobImage);
     fKnobGlobalGain->setAbsolutePos(427-170, 41);
     fKnobGlobalGain->setRange(-30.0f, 30.0f);
     fKnobGlobalGain->setLabel(true);
@@ -197,7 +197,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobGlobalGain->setRotationAngle(240);
     fKnobGlobalGain->setCallback(this);
 
-    fKnobXover2 = new ImageKnob(this, knobImage);
+    fKnobXover2 = new ZamKnob(this, knobImage);
     fKnobXover2->setAbsolutePos(22+333, 121-80);
     fKnobXover2->setRange(1400.f, 14000.f);
     fKnobXover2->setLabel(true);
@@ -207,7 +207,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobXover2->setRotationAngle(240);
     fKnobXover2->setCallback(this);
 
-    fKnobXover1 = new ImageKnob(this, knobImage);
+    fKnobXover1 = new ZamKnob(this, knobImage);
     fKnobXover1->setAbsolutePos(22+333, 175.5-80);
     fKnobXover1->setRange(20.0f, 1400.0f);
     fKnobXover1->setLabel(true);
@@ -217,7 +217,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobXover1->setRotationAngle(240);
     fKnobXover1->setCallback(this);
 
-    fKnobMakeup3 = new ImageKnob(this, knobImage);
+    fKnobMakeup3 = new ZamKnob(this, knobImage);
     fKnobMakeup3->setAbsolutePos(167.75+30, 99.5+134);
     fKnobMakeup3->setRange(0.0f, 30.0f);
     fKnobMakeup3->setLabel(true);
@@ -226,7 +226,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobMakeup3->setRotationAngle(240);
     fKnobMakeup3->setCallback(this);
 
-    fKnobMakeup2 = new ImageKnob(this, knobImage);
+    fKnobMakeup2 = new ZamKnob(this, knobImage);
     fKnobMakeup2->setAbsolutePos(167.75+30, 150.25+134);
     fKnobMakeup2->setRange(0.0f, 30.0f);
     fKnobMakeup2->setLabel(true);
@@ -235,7 +235,7 @@ ZaMultiCompX2UI::ZaMultiCompX2UI()
     fKnobMakeup2->setRotationAngle(240);
     fKnobMakeup2->setCallback(this);
 
-    fKnobMakeup1 = new ImageKnob(this, knobImage);
+    fKnobMakeup1 = new ZamKnob(this, knobImage);
     fKnobMakeup1->setAbsolutePos(167.75+30, 201.4+134);
     fKnobMakeup1->setRange(0.0f, 30.0f);
     fKnobMakeup1->setLabel(true);
@@ -640,7 +640,7 @@ void ZaMultiCompX2UI::programLoaded(uint32_t index)
 // -----------------------------------------------------------------------
 // Widget Callbacks
 
-void ZaMultiCompX2UI::imageKnobDragStarted(ImageKnob* knob)
+void ZaMultiCompX2UI::imageKnobDragStarted(ZamKnob* knob)
 {
     if (knob == fKnobAttack1)
         editParameter(ZaMultiCompX2Plugin::paramAttack1, true);
@@ -686,7 +686,7 @@ void ZaMultiCompX2UI::imageKnobDragStarted(ImageKnob* knob)
         editParameter(ZaMultiCompX2Plugin::paramXover2, true);
 }
 
-void ZaMultiCompX2UI::imageKnobDragFinished(ImageKnob* knob)
+void ZaMultiCompX2UI::imageKnobDragFinished(ZamKnob* knob)
 {
     if (knob == fKnobAttack1)
         editParameter(ZaMultiCompX2Plugin::paramAttack1, false);
@@ -732,7 +732,7 @@ void ZaMultiCompX2UI::imageKnobDragFinished(ImageKnob* knob)
         editParameter(ZaMultiCompX2Plugin::paramXover2, false);
 }
 
-void ZaMultiCompX2UI::imageKnobValueChanged(ImageKnob* knob, float value)
+void ZaMultiCompX2UI::imageKnobValueChanged(ZamKnob* knob, float value)
 {
     if (knob == fKnobAttack1)
         setParameterValue(ZaMultiCompX2Plugin::paramAttack1, value);
diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp
index 98c8eb3..d8919e0 100644
--- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp
+++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp
@@ -20,6 +20,7 @@
 
 #include "DistrhoUI.hpp"
 #include "ImageWidgets.hpp"
+#include "../../widgets/ZamWidgets.hpp"
 
 #include "ZaMultiCompX2Artwork.hpp"
 
@@ -27,7 +28,7 @@
 #define MAX_COMP 3
 
 using DGL::Image;
-using DGL::ImageKnob;
+using DGL::ZamKnob;
 using DGL::ImageSwitch;
 
 START_NAMESPACE_DISTRHO
@@ -35,7 +36,7 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 class ZaMultiCompX2UI : public UI,
-                        public ImageKnob::Callback,
+                        public ZamKnob::Callback,
                         public ImageSwitch::Callback
 {
 public:
@@ -57,9 +58,9 @@ protected:
     // -------------------------------------------------------------------
     // Widget Callbacks
 
-    void imageKnobDragStarted(ImageKnob* knob) override;
-    void imageKnobDragFinished(ImageKnob* knob) override;
-    void imageKnobValueChanged(ImageKnob* knob, float value) override;
+    void imageKnobDragStarted(ZamKnob* knob) override;
+    void imageKnobDragFinished(ZamKnob* knob) override;
+    void imageKnobValueChanged(ZamKnob* knob, float value) override;
 
     void imageSwitchClicked(ImageSwitch* toggle, bool down) override;
 
@@ -85,18 +86,18 @@ sanitize_denormal(double value) {
 
 private:
     Image fImgBackground;
-    ScopedPointer<ImageKnob> fKnobAttack1, fKnobAttack2, fKnobAttack3; 
-    ScopedPointer<ImageKnob> fKnobRelease1, fKnobRelease2, fKnobRelease3;
-    ScopedPointer<ImageKnob> fKnobThresh1, fKnobThresh2, fKnobThresh3;
-    ScopedPointer<ImageKnob> fKnobRatio1;
-    ScopedPointer<ImageKnob> fKnobRatio2;
-    ScopedPointer<ImageKnob> fKnobRatio3;
-    ScopedPointer<ImageKnob> fKnobKnee1;
-    ScopedPointer<ImageKnob> fKnobKnee2;
-    ScopedPointer<ImageKnob> fKnobKnee3;
-    ScopedPointer<ImageKnob> fKnobGlobalGain;
-    ScopedPointer<ImageKnob> fKnobMakeup1, fKnobMakeup2, fKnobMakeup3;
-    ScopedPointer<ImageKnob> fKnobXover1, fKnobXover2;
+    ScopedPointer<ZamKnob> fKnobAttack1, fKnobAttack2, fKnobAttack3; 
+    ScopedPointer<ZamKnob> fKnobRelease1, fKnobRelease2, fKnobRelease3;
+    ScopedPointer<ZamKnob> fKnobThresh1, fKnobThresh2, fKnobThresh3;
+    ScopedPointer<ZamKnob> fKnobRatio1;
+    ScopedPointer<ZamKnob> fKnobRatio2;
+    ScopedPointer<ZamKnob> fKnobRatio3;
+    ScopedPointer<ZamKnob> fKnobKnee1;
+    ScopedPointer<ZamKnob> fKnobKnee2;
+    ScopedPointer<ZamKnob> fKnobKnee3;
+    ScopedPointer<ZamKnob> fKnobGlobalGain;
+    ScopedPointer<ZamKnob> fKnobMakeup1, fKnobMakeup2, fKnobMakeup3;
+    ScopedPointer<ZamKnob> fKnobXover1, fKnobXover2;
     ScopedPointer<ImageSwitch> fToggleBypass1, fToggleBypass2, fToggleBypass3;
     ScopedPointer<ImageSwitch> fToggleListen1, fToggleListen2, fToggleListen3;
     ScopedPointer<ImageSwitch> fToggleStereo;