ZamNoise: Ship new plugin and update UI with new control

Makefile

@@ -6,7 +6,7 @@ HAVE_DGL ?= true
 NAME    = zam-plugins
 VERSION = $(shell cat .version)
 
-PLUGINS=ZamComp ZamCompX2 ZaMultiComp ZamTube ZamEQ2 ZamAutoSat ZamGEQ31 ZaMultiCompX2 ZamGate ZamGateX2 ZamHeadX2 ZaMaximX2 ZamDelay ZamDynamicEQ ZamPhono ZamVerb ZamGrains
+PLUGINS=ZamComp ZamCompX2 ZaMultiComp ZamTube ZamEQ2 ZamAutoSat ZamGEQ31 ZaMultiCompX2 ZamGate ZamGateX2 ZamHeadX2 ZaMaximX2 ZamDelay ZamDynamicEQ ZamPhono ZamVerb ZamGrains ZamNoise
 
 include dpf/Makefile.base.mk
 

plugins/ZamNoise/ZamNoiseArtwork.hpp

@@ -5,6 +5,11 @@
 
 namespace ZamNoiseArtwork
 {
+    extern const char* knobData;
+    const unsigned int knobDataSize = 7056;
+    const unsigned int knobWidth    = 42;
+    const unsigned int knobHeight   = 42;
+
     extern const char* toggleoffData;
     const unsigned int toggleoffDataSize = 1056;
     const unsigned int toggleoffWidth    = 12;
@@ -16,9 +21,9 @@ namespace ZamNoiseArtwork
     const unsigned int toggleonHeight   = 22;
 
     extern const char* zamnoiseData;
-    const unsigned int zamnoiseDataSize = 45264;
-    const unsigned int zamnoiseWidth    = 164;
-    const unsigned int zamnoiseHeight   = 92;
+    const unsigned int zamnoiseDataSize = 114800;
+    const unsigned int zamnoiseWidth    = 287;
+    const unsigned int zamnoiseHeight   = 100;
 }
 
 #endif // BINARY_ZAMNOISEARTWORK_HPP

plugins/ZamNoise/ZamNoiseUI.cpp

@@ -26,19 +26,32 @@ ZamNoiseUI::ZamNoiseUI()
     : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
     // background
-    fImgBackground = Image(ZamNoiseArtwork::zamnoiseData, ZamNoiseArtwork::zamnoiseWidth, ZamNoiseArtwork::zamnoiseHeight, kImageFormatBGR);
+    fImgBackground = Image(ZamNoiseArtwork::zamnoiseData, ZamNoiseArtwork::zamnoiseWidth, ZamNoiseArtwork::zamnoiseHeight);
 
     // toggle img
     Image toggleonImage(ZamNoiseArtwork::toggleonData, ZamNoiseArtwork::toggleonWidth, ZamNoiseArtwork::toggleonHeight);
     Image toggleoffImage(ZamNoiseArtwork::toggleoffData, ZamNoiseArtwork::toggleoffWidth, ZamNoiseArtwork::toggleoffHeight);
 
+    // knob
+    Image knobImage(ZamNoiseArtwork::knobData, ZamNoiseArtwork::knobWidth, ZamNoiseArtwork::knobHeight);
+
     // toggle
     fToggleNoise = new ImageButton(this, toggleonImage, toggleoffImage);
-    fToggleNoise->setAbsolutePos(30, 30);
+    fToggleNoise->setAbsolutePos(244, 40);
     fToggleNoise->setCallback(this);
     fToggleNoise->setCheckable(true);
     fToggleNoise->setChecked(false, false);
 
+    fKnobReduction = new ZamKnob(this, knobImage);
+    fKnobReduction->setAbsolutePos(22, 40);
+    fKnobReduction->setId(ZamNoisePlugin::paramReductionAmount);
+    fKnobReduction->setRange(0.0f, 100.0f);
+    fKnobReduction->setLabel(true);
+    fKnobReduction->setScrollStep(1.0f);
+    fKnobReduction->setDefault(50.0f);
+    fKnobReduction->setRotationAngle(240);
+    fKnobReduction->setCallback(this);
+
     programLoaded(0);
 }
 
@@ -56,6 +69,9 @@ void ZamNoiseUI::parameterChanged(uint32_t index, float value)
     case ZamNoisePlugin::paramNoiseToggle:
         fToggleNoise->setChecked(value > 0.5f, false);
         break;
+    case ZamNoisePlugin::paramReductionAmount:
+        fKnobReduction->setValue(value);
+        break;
     }
 }
 
@@ -66,6 +82,22 @@ void ZamNoiseUI::programLoaded(uint32_t index)
         return;
 
     fToggleNoise->setChecked(false, false);
+    fKnobReduction->setValue(50.f);
+}
+
+void ZamNoiseUI::imageKnobDragStarted(ZamKnob* knob)
+{
+    editParameter(knob->getId(), true);
+}
+
+void ZamNoiseUI::imageKnobDragFinished(ZamKnob* knob)
+{
+    editParameter(knob->getId(), false);
+}
+
+void ZamNoiseUI::imageKnobValueChanged(ZamKnob* knob, float value)
+{
+    setParameterValue(knob->getId(), value);
 }
 
 void ZamNoiseUI::imageButtonClicked(ImageButton*, int)

plugins/ZamNoise/ZamNoiseUI.hpp

@@ -22,17 +22,19 @@
 
 #include "Image.hpp"
 #include "ImageWidgets.hpp"
-
+#include "../../widgets/ZamWidgets.hpp"
 #include "ZamNoisePlugin.hpp"
 
 using DGL::Image;
 using DGL::ImageButton;
+using DGL::ZamKnob;
 
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------
 
 class ZamNoiseUI : public UI,
+                public ZamKnob::Callback,
 		public ImageButton::Callback
 {
 public:
@@ -47,14 +49,19 @@ class ZamNoiseUI : public UI,
     void programLoaded(uint32_t index) override;
 
     // -------------------------------------------------------------------
+    // Widget Callbacks
 
+    void imageKnobDragStarted(ZamKnob* knob) override;
+    void imageKnobDragFinished(ZamKnob* knob) override;
+    void imageKnobValueChanged(ZamKnob* knob, float value) override;
     void imageButtonClicked(ImageButton* imageButton, int button) override;
 
     void onDisplay() override;
 
 private:
     Image fImgBackground;
     ScopedPointer<ImageButton> fToggleNoise;
+    ScopedPointer<ZamKnob> fKnobReduction;
 };
 
 // -----------------------------------------------------------------------