Update DPF and move to new ImageWidgets

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

1 files changed, 26 insertions, 26 deletions

diff --git a/plugins/ZaMultiComp/ZaMultiCompUI.cpp b/plugins/ZaMultiComp/ZaMultiCompUI.cpp
index ee22371..ee7678e 100644
--- a/plugins/ZaMultiComp/ZaMultiCompUI.cpp
+++ b/plugins/ZaMultiComp/ZaMultiCompUI.cpp
@@ -212,38 +212,38 @@ ZaMultiCompUI::ZaMultiCompUI()
 
     Point<int> togglePosStart(247-230+4,108+130+5);
 
-    fToggleBypass3 = new ImageToggle(this, toggleoffImage, toggleonImage);
+    fToggleBypass3 = new ImageSwitch(this, toggleoffImage, toggleonImage);
     fToggleBypass3->setAbsolutePos(togglePosStart);
     fToggleBypass3->setCallback(this);
 
     togglePosStart.setY(158+130+5);
 
-    fToggleBypass2 = new ImageToggle(this, toggleoffImage, toggleonImage);
+    fToggleBypass2 = new ImageSwitch(this, toggleoffImage, toggleonImage);
     fToggleBypass2->setAbsolutePos(togglePosStart);
     fToggleBypass2->setCallback(this);
 
     togglePosStart.setY(209+130+5);
 
-    fToggleBypass1 = new ImageToggle(this, toggleoffImage, toggleonImage);
+    fToggleBypass1 = new ImageSwitch(this, toggleoffImage, toggleonImage);
     fToggleBypass1->setAbsolutePos(togglePosStart);
     fToggleBypass1->setCallback(this);
 
     togglePosStart.setX(278-230+4);
     togglePosStart.setY(113+130+5);
 
-    fToggleListen3 = new ImageToggle(this, toggleoffhImage, toggleonhImage);
+    fToggleListen3 = new ImageSwitch(this, toggleoffhImage, toggleonhImage);
     fToggleListen3->setAbsolutePos(togglePosStart);
     fToggleListen3->setCallback(this);
 
     togglePosStart.setY(164+130+5);
 
-    fToggleListen2 = new ImageToggle(this, toggleoffhImage, toggleonhImage);
+    fToggleListen2 = new ImageSwitch(this, toggleoffhImage, toggleonhImage);
     fToggleListen2->setAbsolutePos(togglePosStart);
     fToggleListen2->setCallback(this);
 
     togglePosStart.setY(214+130+5);
 
-    fToggleListen1 = new ImageToggle(this, toggleoffhImage, toggleonhImage);
+    fToggleListen1 = new ImageSwitch(this, toggleoffhImage, toggleonhImage);
     fToggleListen1->setAbsolutePos(togglePosStart);
     fToggleListen1->setCallback(this);
 
@@ -468,7 +468,7 @@ void ZaMultiCompUI::parameterChanged(uint32_t index, float value)
         }
         break;
     case ZaMultiCompPlugin::paramToggle1:
-        fToggleBypass1->setValue(value);
+        fToggleBypass1->setDown(value > 0.5);
         if (fBypass[0] != value)
         {
             fBypass[0] = value;
@@ -476,7 +476,7 @@ void ZaMultiCompUI::parameterChanged(uint32_t index, float value)
         }
         break;
     case ZaMultiCompPlugin::paramToggle2:
-        fToggleBypass2->setValue(value);
+        fToggleBypass2->setDown(value > 0.5);
         if (fBypass[1] != value)
         {
             fBypass[1] = value;
@@ -484,7 +484,7 @@ void ZaMultiCompUI::parameterChanged(uint32_t index, float value)
         }
         break;
     case ZaMultiCompPlugin::paramToggle3:
-        fToggleBypass3->setValue(value);
+        fToggleBypass3->setDown(value > 0.5);
         if (fBypass[2] != value)
         {
             fBypass[2] = value;
@@ -492,7 +492,7 @@ void ZaMultiCompUI::parameterChanged(uint32_t index, float value)
         }
         break;
     case ZaMultiCompPlugin::paramListen1:
-        fToggleListen1->setValue(value);
+        fToggleListen1->setDown(value > 0.5);
         if (fListen[0] != value)
         {
             fListen[0] = value;
@@ -500,7 +500,7 @@ void ZaMultiCompUI::parameterChanged(uint32_t index, float value)
         }
         break;
     case ZaMultiCompPlugin::paramListen2:
-        fToggleListen2->setValue(value);
+        fToggleListen2->setDown(value > 0.5);
         if (fListen[1] != value)
         {
             fListen[1] = value;
@@ -508,7 +508,7 @@ void ZaMultiCompUI::parameterChanged(uint32_t index, float value)
         }
         break;
     case ZaMultiCompPlugin::paramListen3:
-        fToggleListen3->setValue(value);
+        fToggleListen3->setDown(value > 0.5);
         if (fListen[2] != value)
         {
             fListen[2] = value;
@@ -542,12 +542,12 @@ void ZaMultiCompUI::programLoaded(uint32_t index)
 		fKnobMakeup3->setValue(0.0f);
 		fKnobXover1->setValue(160.0f);
 		fKnobXover2->setValue(1400.0f);
-		fToggleBypass1->setValue(0.0f);
-		fToggleBypass2->setValue(0.0f);
-		fToggleBypass3->setValue(0.0f);
-		fToggleListen1->setValue(0.0f);
-		fToggleListen2->setValue(0.0f);
-		fToggleListen3->setValue(0.0f);
+		fToggleBypass1->setDown(false);
+		fToggleBypass2->setDown(false);
+		fToggleBypass3->setDown(false);
+		fToggleListen1->setDown(false);
+		fToggleListen2->setDown(false);
+		fToggleListen3->setDown(false);
 		fKnobGlobalGain->setValue(0.0f);
 		break;
 	case 1:
@@ -571,12 +571,12 @@ void ZaMultiCompUI::programLoaded(uint32_t index)
 		fKnobMakeup3->setValue(6.0f);
 		fKnobXover1->setValue(160.0f);
 		fKnobXover2->setValue(1400.0f);
-		fToggleBypass1->setValue(1.0f);
-		fToggleBypass2->setValue(1.0f);
-		fToggleBypass3->setValue(1.0f);
-		fToggleListen1->setValue(0.0f);
-		fToggleListen2->setValue(0.0f);
-		fToggleListen3->setValue(0.0f);
+		fToggleBypass1->setDown(true);
+		fToggleBypass2->setDown(true);
+		fToggleBypass3->setDown(true);
+		fToggleListen1->setDown(false);
+		fToggleListen2->setDown(false);
+		fToggleListen3->setDown(false);
 		fKnobGlobalGain->setValue(0.0f);
 		break;
 	}
@@ -753,9 +753,9 @@ void ZaMultiCompUI::imageKnobValueChanged(ImageKnob* knob, float value)
         setParameterValue(ZaMultiCompPlugin::paramXover2, value);
 }
 
-void ZaMultiCompUI::imageToggleClicked(ImageToggle* toggle, int)
+void ZaMultiCompUI::imageSwitchClicked(ImageSwitch* toggle, bool down)
 {
-    float v = toggle->getValue();
+    float v = down ? 1.f : 0.f;
     if (toggle == fToggleBypass1) {
         setParameterValue(ZaMultiCompPlugin::paramToggle1, v);
         fBypass[0] = v;