diff options
author | Damien Zammit <damien@zamaudio.com> | 2016-03-03 17:15:43 +1100 |
---|---|---|
committer | Damien Zammit <damien@zamaudio.com> | 2016-03-03 17:15:43 +1100 |
commit | ff01d4b37f17ffac8424f3903e79e0539f821d74 (patch) | |
tree | df0f54b58f92f70049dc6a6a505b13086207b1cb /plugins | |
parent | 21ccac0c15e1e54d482ff0931b55975a7e2ac62e (diff) |
Update DPF and move to new ImageWidgets
Signed-off-by: Damien Zammit <damien@zamaudio.com>
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/ZaMaximX2/ZaMaximX2UI.hpp | 4 | ||||
-rw-r--r-- | plugins/ZaMultiComp/ZaMultiCompUI.cpp | 52 | ||||
-rw-r--r-- | plugins/ZaMultiComp/ZaMultiCompUI.hpp | 14 | ||||
-rw-r--r-- | plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp | 60 | ||||
-rw-r--r-- | plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp | 16 | ||||
-rw-r--r-- | plugins/ZamComp/ZamCompUI.hpp | 4 | ||||
-rw-r--r-- | plugins/ZamCompX2/ZamCompX2UI.cpp | 14 | ||||
-rw-r--r-- | plugins/ZamCompX2/ZamCompX2UI.hpp | 12 | ||||
-rw-r--r-- | plugins/ZamDelay/ZamDelayUI.cpp | 16 | ||||
-rw-r--r-- | plugins/ZamDelay/ZamDelayUI.hpp | 14 | ||||
-rw-r--r-- | plugins/ZamEQ2/ZamEQ2UI.hpp | 4 | ||||
-rw-r--r-- | plugins/ZamGEQ31/ZamGEQ31UI.hpp | 4 | ||||
-rw-r--r-- | plugins/ZamGate/ZamGateUI.hpp | 2 | ||||
-rw-r--r-- | plugins/ZamGateX2/ZamGateX2UI.hpp | 2 | ||||
-rw-r--r-- | plugins/ZamHeadX2/ZamHeadX2UI.hpp | 2 | ||||
-rw-r--r-- | plugins/ZamTube/ZamTubeUI.cpp | 10 | ||||
-rw-r--r-- | plugins/ZamTube/ZamTubeUI.hpp | 15 |
17 files changed, 113 insertions, 132 deletions
diff --git a/plugins/ZaMaximX2/ZaMaximX2UI.hpp b/plugins/ZaMaximX2/ZaMaximX2UI.hpp index 7e08176..68c1ab2 100644 --- a/plugins/ZaMaximX2/ZaMaximX2UI.hpp +++ b/plugins/ZaMaximX2/ZaMaximX2UI.hpp @@ -19,9 +19,7 @@ #define ZAMAXIMX2UI_HPP_INCLUDED #include "DistrhoUI.hpp" - -#include "ImageKnob.hpp" -#include "ImageToggle.hpp" +#include "ImageWidgets.hpp" #include "ZaMaximX2Artwork.hpp" 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; diff --git a/plugins/ZaMultiComp/ZaMultiCompUI.hpp b/plugins/ZaMultiComp/ZaMultiCompUI.hpp index 327f960..f48d3d3 100644 --- a/plugins/ZaMultiComp/ZaMultiCompUI.hpp +++ b/plugins/ZaMultiComp/ZaMultiCompUI.hpp @@ -19,9 +19,7 @@ #define ZAMULTICOMPUI_HPP_INCLUDED #include "DistrhoUI.hpp" - -#include "ImageKnob.hpp" -#include "ImageToggle.hpp" +#include "ImageWidgets.hpp" #include "ZaMultiCompArtwork.hpp" @@ -30,7 +28,7 @@ using DGL::Image; using DGL::ImageKnob; -using DGL::ImageToggle; +using DGL::ImageSwitch; START_NAMESPACE_DISTRHO @@ -38,7 +36,7 @@ START_NAMESPACE_DISTRHO class ZaMultiCompUI : public UI, public ImageKnob::Callback, - public ImageToggle::Callback + public ImageSwitch::Callback { public: ZaMultiCompUI(); @@ -64,7 +62,7 @@ protected: void imageKnobDragFinished(ImageKnob* knob) override; void imageKnobValueChanged(ImageKnob* knob, float value) override; - void imageToggleClicked(ImageToggle* toggle, int button) override; + void imageSwitchClicked(ImageSwitch* toggle, bool down) override; void onDisplay() override; @@ -100,8 +98,8 @@ private: ScopedPointer<ImageKnob> fKnobGlobalGain; ScopedPointer<ImageKnob> fKnobMakeup1, fKnobMakeup2, fKnobMakeup3; ScopedPointer<ImageKnob> fKnobXover1, fKnobXover2; - ScopedPointer<ImageToggle> fToggleBypass1, fToggleBypass2, fToggleBypass3; - ScopedPointer<ImageToggle> fToggleListen1, fToggleListen2, fToggleListen3; + ScopedPointer<ImageSwitch> fToggleBypass1, fToggleBypass2, fToggleBypass3; + ScopedPointer<ImageSwitch> fToggleListen1, fToggleListen2, fToggleListen3; Image fLedRedImg; float fLedRedValue[3]; diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp index b3849aa..f7ac1f1 100644 --- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp +++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp @@ -213,45 +213,45 @@ ZaMultiCompX2UI::ZaMultiCompX2UI() 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); togglePosStart.setX(369); togglePosStart.setY(181); - fToggleStereo = new ImageToggle(this, toggleoffImage, toggleonImage); + fToggleStereo = new ImageSwitch(this, toggleoffImage, toggleonImage); fToggleStereo->setAbsolutePos(togglePosStart); fToggleStereo->setCallback(this); @@ -480,7 +480,7 @@ void ZaMultiCompX2UI::parameterChanged(uint32_t index, float value) } break; case ZaMultiCompX2Plugin::paramToggle1: - fToggleBypass1->setValue(value); + fToggleBypass1->setDown(value > 0.5); if (fBypass[0] != value) { fBypass[0] = value; @@ -488,7 +488,7 @@ void ZaMultiCompX2UI::parameterChanged(uint32_t index, float value) } break; case ZaMultiCompX2Plugin::paramToggle2: - fToggleBypass2->setValue(value); + fToggleBypass2->setDown(value > 0.5); if (fBypass[1] != value) { fBypass[1] = value; @@ -496,7 +496,7 @@ void ZaMultiCompX2UI::parameterChanged(uint32_t index, float value) } break; case ZaMultiCompX2Plugin::paramToggle3: - fToggleBypass3->setValue(value); + fToggleBypass3->setDown(value > 0.5); if (fBypass[2] != value) { fBypass[2] = value; @@ -504,7 +504,7 @@ void ZaMultiCompX2UI::parameterChanged(uint32_t index, float value) } break; case ZaMultiCompX2Plugin::paramListen1: - fToggleListen1->setValue(value); + fToggleListen1->setDown(value > 0.5); if (fListen[0] != value) { fListen[0] = value; @@ -512,7 +512,7 @@ void ZaMultiCompX2UI::parameterChanged(uint32_t index, float value) } break; case ZaMultiCompX2Plugin::paramListen2: - fToggleListen2->setValue(value); + fToggleListen2->setDown(value > 0.5); if (fListen[1] != value) { fListen[1] = value; @@ -520,7 +520,7 @@ void ZaMultiCompX2UI::parameterChanged(uint32_t index, float value) } break; case ZaMultiCompX2Plugin::paramListen3: - fToggleListen3->setValue(value); + fToggleListen3->setDown(value > 0.5); if (fListen[2] != value) { fListen[2] = value; @@ -528,7 +528,7 @@ void ZaMultiCompX2UI::parameterChanged(uint32_t index, float value) } break; case ZaMultiCompX2Plugin::paramStereoDet: - fToggleStereo->setValue(value); + fToggleStereo->setDown(value > 0.5); break; } } @@ -557,13 +557,13 @@ void ZaMultiCompX2UI::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); - fToggleStereo->setValue(1.0f); + fToggleBypass1->setDown(false); + fToggleBypass2->setDown(false); + fToggleBypass3->setDown(false); + fToggleListen1->setDown(false); + fToggleListen2->setDown(false); + fToggleListen3->setDown(false); + fToggleStereo->setDown(true); fKnobGlobalGain->setValue(0.0f); break; case 1: @@ -587,13 +587,13 @@ void ZaMultiCompX2UI::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); - fToggleStereo->setValue(1.0f); + fToggleBypass1->setDown(true); + fToggleBypass2->setDown(true); + fToggleBypass3->setDown(true); + fToggleListen1->setDown(false); + fToggleListen2->setDown(false); + fToggleListen3->setDown(false); + fToggleStereo->setDown(true); fKnobGlobalGain->setValue(0.0f); break; } @@ -770,9 +770,9 @@ void ZaMultiCompX2UI::imageKnobValueChanged(ImageKnob* knob, float value) setParameterValue(ZaMultiCompX2Plugin::paramXover2, value); } -void ZaMultiCompX2UI::imageToggleClicked(ImageToggle* toggle, int) +void ZaMultiCompX2UI::imageSwitchClicked(ImageSwitch* toggle, bool down) { - float v = toggle->getValue(); + float v = down ? 1.f : 0.f; if (toggle == fToggleBypass1) { setParameterValue(ZaMultiCompX2Plugin::paramToggle1, v); fBypass[0] = v; diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp index eed11d0..87b0c1a 100644 --- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp +++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp @@ -19,9 +19,7 @@ #define ZAMULTICOMPUI_HPP_INCLUDED #include "DistrhoUI.hpp" - -#include "ImageKnob.hpp" -#include "ImageToggle.hpp" +#include "ImageWidgets.hpp" #include "ZaMultiCompX2Artwork.hpp" @@ -30,7 +28,7 @@ using DGL::Image; using DGL::ImageKnob; -using DGL::ImageToggle; +using DGL::ImageSwitch; START_NAMESPACE_DISTRHO @@ -38,7 +36,7 @@ START_NAMESPACE_DISTRHO class ZaMultiCompX2UI : public UI, public ImageKnob::Callback, - public ImageToggle::Callback + public ImageSwitch::Callback { public: ZaMultiCompX2UI(); @@ -64,7 +62,7 @@ protected: void imageKnobDragFinished(ImageKnob* knob) override; void imageKnobValueChanged(ImageKnob* knob, float value) override; - void imageToggleClicked(ImageToggle* toggle, int button) override; + void imageSwitchClicked(ImageSwitch* toggle, bool down) override; void onDisplay() override; @@ -100,9 +98,9 @@ private: ScopedPointer<ImageKnob> fKnobGlobalGain; ScopedPointer<ImageKnob> fKnobMakeup1, fKnobMakeup2, fKnobMakeup3; ScopedPointer<ImageKnob> fKnobXover1, fKnobXover2; - ScopedPointer<ImageToggle> fToggleBypass1, fToggleBypass2, fToggleBypass3; - ScopedPointer<ImageToggle> fToggleListen1, fToggleListen2, fToggleListen3; - ScopedPointer<ImageToggle> fToggleStereo; + ScopedPointer<ImageSwitch> fToggleBypass1, fToggleBypass2, fToggleBypass3; + ScopedPointer<ImageSwitch> fToggleListen1, fToggleListen2, fToggleListen3; + ScopedPointer<ImageSwitch> fToggleStereo; Image fLedRedImg; float fLedRedValue[3]; diff --git a/plugins/ZamComp/ZamCompUI.hpp b/plugins/ZamComp/ZamCompUI.hpp index b22a1f8..77f8b18 100644 --- a/plugins/ZamComp/ZamCompUI.hpp +++ b/plugins/ZamComp/ZamCompUI.hpp @@ -19,9 +19,7 @@ #define ZAMCOMPUI_HPP_INCLUDED #include "DistrhoUI.hpp" - -#include "ImageKnob.hpp" -#include "ImageToggle.hpp" +#include "ImageWidgets.hpp" #include "ZamCompArtwork.hpp" diff --git a/plugins/ZamCompX2/ZamCompX2UI.cpp b/plugins/ZamCompX2/ZamCompX2UI.cpp index 820b730..bcc5596 100644 --- a/plugins/ZamCompX2/ZamCompX2UI.cpp +++ b/plugins/ZamCompX2/ZamCompX2UI.cpp @@ -111,7 +111,7 @@ ZamCompX2UI::ZamCompX2UI() fKnobSlew->setRotationAngle(240); fKnobSlew->setCallback(this); - fToggleStereo = new ImageToggle(this, fToggleOffImg, fToggleOnImg); + fToggleStereo = new ImageSwitch(this, fToggleOffImg, fToggleOnImg); fToggleStereo->setAbsolutePos(740, 61); fToggleStereo->setId(ZamCompX2Plugin::paramStereo); fToggleStereo->setCallback(this); @@ -149,7 +149,7 @@ void ZamCompX2UI::parameterChanged(uint32_t index, float value) fKnobSlew->setValue(value); break; case ZamCompX2Plugin::paramStereo: - fToggleStereo->setValue(value); + fToggleStereo->setDown(value > 0.5); break; case ZamCompX2Plugin::paramGainRed: if (fLedRedValue != value) @@ -179,7 +179,7 @@ void ZamCompX2UI::programLoaded(uint32_t index) fKnobThresh->setValue(0.0f); fKnobMakeup->setValue(0.0f); fKnobSlew->setValue(1.0f); - fToggleStereo->setValue(0.f); + fToggleStereo->setDown(false); break; case 1: fKnobAttack->setValue(10.0f); @@ -189,7 +189,7 @@ void ZamCompX2UI::programLoaded(uint32_t index) fKnobThresh->setValue(-18.0f); fKnobMakeup->setValue(6.0f); fKnobSlew->setValue(20.0f); - fToggleStereo->setValue(1.f); + fToggleStereo->setDown(true); break; case 2: fKnobAttack->setValue(50.0f); @@ -199,7 +199,7 @@ void ZamCompX2UI::programLoaded(uint32_t index) fKnobThresh->setValue(-16.0f); fKnobMakeup->setValue(9.0f); fKnobSlew->setValue(1.0f); - fToggleStereo->setValue(1.f); + fToggleStereo->setDown(true); break; } } @@ -222,9 +222,9 @@ void ZamCompX2UI::imageKnobValueChanged(ImageKnob* knob, float value) setParameterValue(knob->getId(), value); } -void ZamCompX2UI::imageToggleClicked(ImageToggle* tog, int) +void ZamCompX2UI::imageSwitchClicked(ImageSwitch* tog, bool down) { - setParameterValue(tog->getId(), tog->getValue()); + setParameterValue(tog->getId(), down ? 1.f : 0.f); } void ZamCompX2UI::onDisplay() diff --git a/plugins/ZamCompX2/ZamCompX2UI.hpp b/plugins/ZamCompX2/ZamCompX2UI.hpp index bcb8a67..c17db79 100644 --- a/plugins/ZamCompX2/ZamCompX2UI.hpp +++ b/plugins/ZamCompX2/ZamCompX2UI.hpp @@ -19,15 +19,13 @@ #define ZAMCOMPX2UI_HPP_INCLUDED #include "DistrhoUI.hpp" - -#include "ImageKnob.hpp" -#include "ImageToggle.hpp" +#include "ImageWidgets.hpp" #include "ZamCompX2Artwork.hpp" using DGL::Image; using DGL::ImageKnob; -using DGL::ImageToggle; +using DGL::ImageSwitch; START_NAMESPACE_DISTRHO @@ -35,7 +33,7 @@ START_NAMESPACE_DISTRHO class ZamCompX2UI : public UI, public ImageKnob::Callback, - public ImageToggle::Callback + public ImageSwitch::Callback { public: ZamCompX2UI(); @@ -53,7 +51,7 @@ protected: void imageKnobDragStarted(ImageKnob* knob) override; void imageKnobDragFinished(ImageKnob* knob) override; void imageKnobValueChanged(ImageKnob* knob, float value) override; - void imageToggleClicked(ImageToggle* toggle, int button) override; + void imageSwitchClicked(ImageSwitch* toggle, bool down) override; void onDisplay() override; @@ -61,7 +59,7 @@ private: Image fImgBackground; ScopedPointer<ImageKnob> fKnobAttack, fKnobRelease, fKnobThresh; ScopedPointer<ImageKnob> fKnobRatio, fKnobKnee, fKnobMakeup, fKnobSlew; - ScopedPointer<ImageToggle> fToggleStereo; + ScopedPointer<ImageSwitch> fToggleStereo; Image fLedRedImg; float fLedRedValue; diff --git a/plugins/ZamDelay/ZamDelayUI.cpp b/plugins/ZamDelay/ZamDelayUI.cpp index c9d8ac8..1e79186 100644 --- a/plugins/ZamDelay/ZamDelayUI.cpp +++ b/plugins/ZamDelay/ZamDelayUI.cpp @@ -57,12 +57,12 @@ ZamDelayUI::ZamDelayUI() fKnobDelaytime->setRotationAngle(240); fKnobDelaytime->setCallback(this); - fToggleInvert = new ImageToggle(this, invertoffImage, invertonImage); + fToggleInvert = new ImageSwitch(this, invertoffImage, invertonImage); fToggleInvert->setAbsolutePos(10, 15); fToggleInvert->setId(ZamDelayPlugin::paramInvert); fToggleInvert->setCallback(this); - fToggleBPM = new ImageToggle(this, syncoffImage, synconImage); + fToggleBPM = new ImageSwitch(this, syncoffImage, synconImage); fToggleBPM->setAbsolutePos(280, 80); fToggleBPM->setId(ZamDelayPlugin::paramSync); fToggleBPM->setCallback(this); @@ -123,13 +123,13 @@ void ZamDelayUI::parameterChanged(uint32_t index, float value) switch (index) { case ZamDelayPlugin::paramInvert: - fToggleInvert->setValue(value); + fToggleInvert->setDown(value > 0.5); break; case ZamDelayPlugin::paramDelaytime: fKnobDelaytime->setValue(value); break; case ZamDelayPlugin::paramSync: - fToggleBPM->setValue(value); + fToggleBPM->setDown(value > 0.5); break; case ZamDelayPlugin::paramLPF: fKnobLPF->setValue(value); @@ -156,9 +156,9 @@ void ZamDelayUI::programLoaded(uint32_t index) { switch(index) { case 0: - fToggleInvert->setValue(0.0f); + fToggleInvert->setDown(false); fKnobDelaytime->setValue(160.0f); - fToggleBPM->setValue(0.0f); + fToggleBPM->setDown(false); fKnobLPF->setValue(6000.0f); fKnobGain->setValue(0.0f); fKnobDrywet->setValue(0.5f); @@ -171,9 +171,9 @@ void ZamDelayUI::programLoaded(uint32_t index) // ----------------------------------------------------------------------- // Widget Callbacks -void ZamDelayUI::imageToggleClicked(ImageToggle* tog, int) +void ZamDelayUI::imageSwitchClicked(ImageSwitch* tog, bool down) { - setParameterValue(tog->getId(), tog->getValue()); + setParameterValue(tog->getId(), down ? 1.f : 0.f); } void ZamDelayUI::imageSliderDragStarted(ImageSlider* s) diff --git a/plugins/ZamDelay/ZamDelayUI.hpp b/plugins/ZamDelay/ZamDelayUI.hpp index 9cb60d3..6110eab 100644 --- a/plugins/ZamDelay/ZamDelayUI.hpp +++ b/plugins/ZamDelay/ZamDelayUI.hpp @@ -19,15 +19,13 @@ #define ZAMCOMPUI_HPP_INCLUDED #include "DistrhoUI.hpp" - -#include "ImageKnob.hpp" -#include "ImageToggle.hpp" +#include "ImageWidgets.hpp" #include "ZamDelayArtwork.hpp" using DGL::Image; using DGL::ImageKnob; -using DGL::ImageToggle; +using DGL::ImageSwitch; using DGL::ImageSlider; START_NAMESPACE_DISTRHO @@ -36,7 +34,7 @@ START_NAMESPACE_DISTRHO class ZamDelayUI : public UI, public ImageKnob::Callback, - public ImageToggle::Callback, + public ImageSwitch::Callback, public ImageSlider::Callback { public: @@ -56,7 +54,7 @@ protected: void imageKnobDragFinished(ImageKnob* knob) override; void imageKnobValueChanged(ImageKnob* knob, float value) override; - void imageToggleClicked(ImageToggle* imageToggle, int button) override; + void imageSwitchClicked(ImageSwitch* tog, bool down) override; void imageSliderDragStarted(ImageSlider* s) override; void imageSliderDragFinished(ImageSlider* s) override; @@ -67,7 +65,7 @@ protected: private: Image fImgBackground; ScopedPointer<ImageKnob> fKnobDelaytime, fKnobLPF, fKnobGain, fKnobDrywet, fKnobFeedback; - ScopedPointer<ImageToggle> fToggleInvert, fToggleBPM; + ScopedPointer<ImageSwitch> fToggleInvert, fToggleBPM; ScopedPointer<ImageSlider> fSliderDiv; }; @@ -75,4 +73,4 @@ private: END_NAMESPACE_DISTRHO -#endif // ZAMCOMPUI_HPP_INCLUDED +#endif diff --git a/plugins/ZamEQ2/ZamEQ2UI.hpp b/plugins/ZamEQ2/ZamEQ2UI.hpp index 53ce272..304898c 100644 --- a/plugins/ZamEQ2/ZamEQ2UI.hpp +++ b/plugins/ZamEQ2/ZamEQ2UI.hpp @@ -19,9 +19,7 @@ #define ZAMEQ2UI_HPP_INCLUDED #include "DistrhoUI.hpp" - -#include "ImageKnob.hpp" -#include "ImageSlider.hpp" +#include "ImageWidgets.hpp" #include "ZamEQ2Artwork.hpp" #include "ZamEQ2Plugin.hpp" diff --git a/plugins/ZamGEQ31/ZamGEQ31UI.hpp b/plugins/ZamGEQ31/ZamGEQ31UI.hpp index 97e4a84..4ccbde4 100644 --- a/plugins/ZamGEQ31/ZamGEQ31UI.hpp +++ b/plugins/ZamGEQ31/ZamGEQ31UI.hpp @@ -19,9 +19,7 @@ #define ZAMGEQ31UI_HPP_INCLUDED #include "DistrhoUI.hpp" - -#include "ImageKnob.hpp" -#include "ImageSlider.hpp" +#include "ImageWidgets.hpp" #include "ZamGEQ31Artwork.hpp" #include "ZamGEQ31Plugin.hpp" diff --git a/plugins/ZamGate/ZamGateUI.hpp b/plugins/ZamGate/ZamGateUI.hpp index 84a3d2d..a73074f 100644 --- a/plugins/ZamGate/ZamGateUI.hpp +++ b/plugins/ZamGate/ZamGateUI.hpp @@ -19,7 +19,7 @@ #define ZAMGATEUI_HPP_INCLUDED #include "DistrhoUI.hpp" -#include "ImageKnob.hpp" +#include "ImageWidgets.hpp" #include "ZamGateArtwork.hpp" using DGL::Image; diff --git a/plugins/ZamGateX2/ZamGateX2UI.hpp b/plugins/ZamGateX2/ZamGateX2UI.hpp index 7a80933..9fd944e 100644 --- a/plugins/ZamGateX2/ZamGateX2UI.hpp +++ b/plugins/ZamGateX2/ZamGateX2UI.hpp @@ -19,7 +19,7 @@ #define ZAMGATEX2UI_HPP_INCLUDED #include "DistrhoUI.hpp" -#include "ImageKnob.hpp" +#include "ImageWidgets.hpp" #include "ZamGateX2Artwork.hpp" using DGL::Image; diff --git a/plugins/ZamHeadX2/ZamHeadX2UI.hpp b/plugins/ZamHeadX2/ZamHeadX2UI.hpp index 7312584..9ba87d0 100644 --- a/plugins/ZamHeadX2/ZamHeadX2UI.hpp +++ b/plugins/ZamHeadX2/ZamHeadX2UI.hpp @@ -19,8 +19,8 @@ #define ZAMCOMPX2UI_HPP_INCLUDED #include "DistrhoUI.hpp" +#include "ImageWidgets.hpp" -#include "ImageKnob.hpp" #include "ZamHeadX2Artwork.hpp" using DGL::Image; diff --git a/plugins/ZamTube/ZamTubeUI.cpp b/plugins/ZamTube/ZamTubeUI.cpp index d7d8b84..6793013 100644 --- a/plugins/ZamTube/ZamTubeUI.cpp +++ b/plugins/ZamTube/ZamTubeUI.cpp @@ -102,7 +102,7 @@ ZamTubeUI::ZamTubeUI() Point<int> insaneStart(165,140); - fToggleInsane = new ImageToggle(this, insaneImageOff, insaneImageOn); + fToggleInsane = new ImageSwitch(this, insaneImageOff, insaneImageOn); fToggleInsane->setAbsolutePos(insaneStart); fToggleInsane->setCallback(this); @@ -136,7 +136,7 @@ void ZamTubeUI::parameterChanged(uint32_t index, float value) fKnobGain->setValue(value); break; case ZamTubePlugin::paramInsane: - fToggleInsane->setValue(value); + fToggleInsane->setDown(value > 0.5); break; } } @@ -152,7 +152,7 @@ void ZamTubeUI::programLoaded(uint32_t index) fKnobMids->setValue(0.5f); fKnobTreb->setValue(0.0f); fKnobGain->setValue(0.0f); - fToggleInsane->setValue(0.0f); + fToggleInsane->setDown(false); fSliderNotch->setValue(0.0f); } @@ -216,9 +216,9 @@ void ZamTubeUI::imageSliderValueChanged(ImageSlider*, float value) setParameterValue(ZamTubePlugin::paramToneStack, value); } -void ZamTubeUI::imageToggleClicked(ImageToggle* toggle, int) +void ZamTubeUI::imageSwitchClicked(ImageSwitch* toggle, bool down) { - float v = toggle->getValue(); + float v = down ? 1.f : 0.f; if (toggle == fToggleInsane) { setParameterValue(ZamTubePlugin::paramInsane, v); } diff --git a/plugins/ZamTube/ZamTubeUI.hpp b/plugins/ZamTube/ZamTubeUI.hpp index c4f6b12..f7b0768 100644 --- a/plugins/ZamTube/ZamTubeUI.hpp +++ b/plugins/ZamTube/ZamTubeUI.hpp @@ -19,17 +19,14 @@ #define ZAMTUBEUI_HPP_INCLUDED #include "DistrhoUI.hpp" - -#include "ImageKnob.hpp" -#include "ImageSlider.hpp" -#include "ImageToggle.hpp" +#include "ImageWidgets.hpp" #include "ZamTubeArtwork.hpp" using DGL::Image; using DGL::ImageKnob; using DGL::ImageSlider; -using DGL::ImageToggle; +using DGL::ImageSwitch; START_NAMESPACE_DISTRHO @@ -38,7 +35,7 @@ START_NAMESPACE_DISTRHO class ZamTubeUI : public UI, public ImageKnob::Callback, public ImageSlider::Callback, - public ImageToggle::Callback + public ImageSwitch::Callback { public: ZamTubeUI(); @@ -60,15 +57,15 @@ protected: void imageSliderDragStarted(ImageSlider* slider) override; void imageSliderDragFinished(ImageSlider* slider) override; void imageSliderValueChanged(ImageSlider* slider, float value) override; - - void imageToggleClicked(ImageToggle* toggle, int value) override; + + void imageSwitchClicked(ImageSwitch* toggle, bool down) override; void onDisplay() override; private: Image fImgBackground; ScopedPointer<ImageSlider> fSliderNotch; - ScopedPointer<ImageToggle> fToggleInsane; + ScopedPointer<ImageSwitch> fToggleInsane; ScopedPointer<ImageKnob> fKnobTube, fKnobBass, fKnobMids, fKnobTreb, fKnobGain; }; |