WIP Fix ZamNoisenoise-fixes

4 files changed, 14 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 3220651..269b59b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ BINDIR ?= bin
 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 ZamCleaner ZamNoise
 
 include Makefile.mk
 
diff --git a/plugins/ZamNoise/Denoise.cpp b/plugins/ZamNoise/Denoise.cpp
index 8d413f9..e4ac56d 100644
--- a/plugins/ZamNoise/Denoise.cpp
+++ b/plugins/ZamNoise/Denoise.cpp
@@ -240,7 +240,7 @@ void Denoise::fft_remove_noise(const float* ins, float* outs, uint32_t frames, f
 
 
 	SFM = 10.0*( kinv*sum_log_p - log10(sum_p*kinv) );
-	tonality_factor = MIN(SFM/-60.0, 1);
+	tonality_factor = MAX(SFM/-60.0, -1.);
     }
 
         for (k = 1; k <= FFT_SIZE/2 ; ++k) {
diff --git a/plugins/ZamNoise/ZamNoiseUI.cpp b/plugins/ZamNoise/ZamNoiseUI.cpp
index a2001d6..692b522 100644
--- a/plugins/ZamNoise/ZamNoiseUI.cpp
+++ b/plugins/ZamNoise/ZamNoiseUI.cpp
@@ -35,10 +35,10 @@ ZamNoiseUI::ZamNoiseUI()
     Image toggleoffImage(ZamNoiseArtwork::toggleoffData, ZamNoiseArtwork::toggleoffWidth, ZamNoiseArtwork::toggleoffHeight);
 
     // toggle
-    fToggleNoise = new ImageToggle(this, toggleonImage, toggleoffImage);
+    fToggleNoise = new ImageSwitch(this, toggleonImage, toggleoffImage);
     fToggleNoise->setAbsolutePos(30, 30);
     fToggleNoise->setCallback(this);
-    fToggleNoise->setValue(0.f);
+    fToggleNoise->setDown(false);
 
     programLoaded(0);
 }
@@ -55,7 +55,7 @@ void ZamNoiseUI::parameterChanged(uint32_t index, float value)
         switch (index)
         {
         case ZamNoisePlugin::paramNoiseToggle:
-                fToggleNoise->setValue(value);
+                fToggleNoise->setDown(value > 0.5);
                 break;
         }
 }
@@ -66,14 +66,13 @@ void ZamNoiseUI::programLoaded(uint32_t index)
     if (index != 0)
         return;
 
-    fToggleNoise->setValue(0.0f);
+    fToggleNoise->setDown(false);
 }
 
-void ZamNoiseUI::imageToggleClicked(ImageToggle*, int)
+void ZamNoiseUI::imageSwitchClicked(ImageSwitch*, bool down)
 {
-        float toggle = fToggleNoise->getValue();
-        fToggleNoise->setValue(toggle);
-        setParameterValue(ZamNoisePlugin::paramNoiseToggle, toggle);
+	float v = down ? 1.f : 0.f;
+        setParameterValue(ZamNoisePlugin::paramNoiseToggle, v);
 }
 
 
diff --git a/plugins/ZamNoise/ZamNoiseUI.hpp b/plugins/ZamNoise/ZamNoiseUI.hpp
index 5eb72e9..45cdcfa 100644
--- a/plugins/ZamNoise/ZamNoiseUI.hpp
+++ b/plugins/ZamNoise/ZamNoiseUI.hpp
@@ -21,20 +21,20 @@
 #include "DistrhoUI.hpp"
 
 #include "Image.hpp"
-#include "ImageToggle.hpp"
+#include "ImageWidgets.hpp"
 
 #include "ZamNoiseArtwork.hpp"
 #include "ZamNoisePlugin.hpp"
 
 using DGL::Image;
-using DGL::ImageToggle;
+using DGL::ImageSwitch;
 
 START_NAMESPACE_DISTRHO
 
 // -----------------------------------------------------------------------
 
 class ZamNoiseUI : public UI,
-		public ImageToggle::Callback
+		public ImageSwitch::Callback
 {
 public:
     ZamNoiseUI();
@@ -49,13 +49,13 @@ protected:
 
     // -------------------------------------------------------------------
 
-    void imageToggleClicked(ImageToggle* imageToggle, int button) override;
+    void imageSwitchClicked(ImageSwitch* imageSwitch, bool down) override;
 
     void onDisplay() override;
 
 private:
     Image fImgBackground;
-    ScopedPointer<ImageToggle> fToggleNoise;
+    ScopedPointer<ImageSwitch> fToggleNoise;
 };
 
 // -----------------------------------------------------------------------