Start updating code for latest DPF

Signed-off-by: falkTX <falktx@falktx.com>

5 files changed, 47 insertions, 51 deletions

diff --git a/plugins/ZaMultiComp/DistrhoPluginInfo.h b/plugins/ZaMultiComp/DistrhoPluginInfo.h
index 06b0cf7..eea61ce 100644
--- a/plugins/ZaMultiComp/DistrhoPluginInfo.h
+++ b/plugins/ZaMultiComp/DistrhoPluginInfo.h
@@ -33,7 +33,8 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
-#define DISTRHO_PLUGIN_URI "urn:zamaudio:ZaMultiComp"
+#define DISTRHO_PLUGIN_URI          "urn:zamaudio:ZaMultiComp"
+#define DISTRHO_PLUGIN_CLAP_ID      "com.zamaudio.ZaMultiComp"
 #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:DynamicsPlugin"
 
 #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED
diff --git a/plugins/ZaMultiComp/Makefile b/plugins/ZaMultiComp/Makefile
index a9fabf8..6530f22 100644
--- a/plugins/ZaMultiComp/Makefile
+++ b/plugins/ZaMultiComp/Makefile
@@ -27,21 +27,11 @@ include ../../dpf/Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
-
-ifeq ($(UNIX),true)
-TARGETS += ladspa
-endif
-
-ifeq ($(HAVE_DGL),true)
 TARGETS += lv2_sep
-else
-TARGETS += lv2_dsp
-endif
-
-TARGETS += vst
+TARGETS += vst2
+TARGETS += vst3
+TARGETS += clap
 
 all: $(TARGETS)
 
diff --git a/plugins/ZamComp/ZamCompUI.cpp b/plugins/ZamComp/ZamCompUI.cpp
index b7f1c45..1872679 100644
--- a/plugins/ZamComp/ZamCompUI.cpp
+++ b/plugins/ZamComp/ZamCompUI.cpp
@@ -30,7 +30,7 @@ ZamCompUI::ZamCompUI()
     setSize(ZamCompArtwork::zamcompWidth, ZamCompArtwork::zamcompHeight);
 
     // background
-    fImgBackground = Image(ZamCompArtwork::zamcompData, ZamCompArtwork::zamcompWidth, ZamCompArtwork::zamcompHeight, GL_BGR);
+    fImgBackground = Image(ZamCompArtwork::zamcompData, ZamCompArtwork::zamcompWidth, ZamCompArtwork::zamcompHeight, kImageFormatBGR);
 
     // led images
     fLedRedImg = Image(ZamCompArtwork::ledredData, ZamCompArtwork::ledredWidth, ZamCompArtwork::ledredHeight);
@@ -237,7 +237,8 @@ void ZamCompUI::imageSwitchClicked(ImageSwitch* tog, bool down)
 
 void ZamCompUI::onDisplay()
 {
-    fImgBackground.draw();
+    const GraphicsContext& context(getGraphicsContext());
+    fImgBackground.draw(context);
 
     // draw leds
     static const float sLedSpacing  = 15.5f;
@@ -275,8 +276,8 @@ void ZamCompUI::onDisplay()
 		numRedLeds = 1;
 	else numRedLeds = 0;
 
-    for (int i=numRedLeds; i>0; --i)
-        fLedRedImg.drawAt(sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY);
+	for (int i=numRedLeds; i>0; --i)
+		fLedRedImg.drawAt(context, sLedInitialX + (12 - i)*sLedSpacing, sRedLedStaticY);
 
 	if (fLedYellowValue >= 20.f)
 		numYellowLeds = 19;
@@ -320,12 +321,12 @@ void ZamCompUI::onDisplay()
 
 	if (numYellowLeds > 12) {
 		for (int i=12; i<numYellowLeds; ++i)
-			fLedRedImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY);
+			fLedRedImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY);
 		for (int i=0; i<12; ++i)
-			fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY);
+			fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY);
 	} else {
 		for (int i=0; i<numYellowLeds; ++i)
-			fLedYellowImg.drawAt(sLedInitialX + i*sLedSpacing, sYellowLedStaticY);
+			fLedYellowImg.drawAt(context, sLedInitialX + i*sLedSpacing, sYellowLedStaticY);
 	}
 }
 
diff --git a/plugins/ZamDynamicEQ/ZamDynamicEQUI.cpp b/plugins/ZamDynamicEQ/ZamDynamicEQUI.cpp
index db3abf7..cb9331e 100644
--- a/plugins/ZamDynamicEQ/ZamDynamicEQUI.cpp
+++ b/plugins/ZamDynamicEQ/ZamDynamicEQUI.cpp
@@ -28,7 +28,7 @@ ZamDynamicEQUI::ZamDynamicEQUI()
     setSize(ZamDynamicEQArtwork::zamdynamiceqWidth, ZamDynamicEQArtwork::zamdynamiceqHeight);
 
     // background
-    fImgBackground = Image(ZamDynamicEQArtwork::zamdynamiceqData, ZamDynamicEQArtwork::zamdynamiceqWidth, ZamDynamicEQArtwork::zamdynamiceqHeight, GL_BGR);
+    fImgBackground = Image(ZamDynamicEQArtwork::zamdynamiceqData, ZamDynamicEQArtwork::zamdynamiceqWidth, ZamDynamicEQArtwork::zamdynamiceqHeight, kImageFormatBGR);
 
     // images
     fHighOnImg = Image(ZamDynamicEQArtwork::highonData, ZamDynamicEQArtwork::highonWidth, ZamDynamicEQArtwork::highonHeight);
@@ -49,24 +49,27 @@ ZamDynamicEQUI::ZamDynamicEQUI()
 
     Point<int> togglePosStart(20,135+yy);
 
-    fToggleLow = new ZamSwitch(this, fLowOffImg, fLowOnImg);
+    fToggleLow = new ImageButton(this, fLowOffImg, fLowOnImg);
     fToggleLow->setAbsolutePos(togglePosStart);
     fToggleLow->setId(ZamDynamicEQPlugin::paramToggleLow);
     fToggleLow->setCallback(this);
+    fToggleLow->setCheckable(true);
 
     togglePosStart.setY(172+yy);
 
-    fTogglePeak = new ZamSwitch(this, fPeakOffImg, fPeakOnImg);
+    fTogglePeak = new ImageButton(this, fPeakOffImg, fPeakOnImg);
     fTogglePeak->setAbsolutePos(togglePosStart);
     fTogglePeak->setId(ZamDynamicEQPlugin::paramTogglePeak);
     fTogglePeak->setCallback(this);
+    fTogglePeak->setCheckable(true);
 
     togglePosStart.setY(209+yy);
 
-    fToggleHigh = new ZamSwitch(this, fHighOffImg, fHighOnImg);
+    fToggleHigh = new ImageButton(this, fHighOffImg, fHighOnImg);
     fToggleHigh->setAbsolutePos(togglePosStart);
     fToggleHigh->setId(ZamDynamicEQPlugin::paramToggleHigh);
     fToggleHigh->setCallback(this);
+    fToggleHigh->setCheckable(true);
 
     togglePosStart.setX(278-230+4);
     togglePosStart.setY(113+130+5+yy);
@@ -230,13 +233,13 @@ void ZamDynamicEQUI::parameterChanged(uint32_t index, float value)
         fToggleBoostCut->setDown(value > 0.5);
         break;
     case ZamDynamicEQPlugin::paramToggleLow:
-        fToggleLow->setDown(value > 0.5);
+        fToggleLow->setChecked(value > 0.5, false);
         break;
     case ZamDynamicEQPlugin::paramTogglePeak:
-        fTogglePeak->setDown(value > 0.5);
+        fTogglePeak->setChecked(value > 0.5, false);
         break;
     case ZamDynamicEQPlugin::paramToggleHigh:
-        fToggleHigh->setDown(value > 0.5);
+        fToggleHigh->setChecked(value > 0.5, false);
         break;
     case ZamDynamicEQPlugin::paramControlGain:
         fControlGain = value;
@@ -271,9 +274,9 @@ void ZamDynamicEQUI::programLoaded(uint32_t index)
 		fKnobTargetFreq->setValue(1000.0f);
 		fKnobTargetWidth->setValue(1.0f);
 		fKnobDetectFreq->setValue(1000.0f);
-		fToggleLow->setDown(false);
-		fTogglePeak->setDown(true);
-		fToggleHigh->setDown(false);
+		fToggleLow->setChecked(false, false);
+		fTogglePeak->setChecked(true, false);
+		fToggleHigh->setChecked(false, false);
 		break;
 	case 1:
 		fKnobAttack->setValue(10.0f);
@@ -288,9 +291,9 @@ void ZamDynamicEQUI::programLoaded(uint32_t index)
 		fKnobTargetFreq->setValue(1000.0f);
 		fKnobTargetWidth->setValue(1.0f);
 		fKnobDetectFreq->setValue(1000.0f);
-		fToggleLow->setDown(false);
-		fTogglePeak->setDown(true);
-		fToggleHigh->setDown(false);
+		fToggleLow->setChecked(false, false);
+		fTogglePeak->setChecked(true, false);
+		fToggleHigh->setChecked(false, false);
 		break;
 	case 2:
 		fKnobAttack->setValue(50.0f);
@@ -305,9 +308,9 @@ void ZamDynamicEQUI::programLoaded(uint32_t index)
 		fKnobTargetFreq->setValue(1000.0f);
 		fKnobTargetWidth->setValue(1.0f);
 		fKnobDetectFreq->setValue(1000.0f);
-		fToggleLow->setDown(false);
-		fTogglePeak->setDown(true);
-		fToggleHigh->setDown(false);
+		fToggleLow->setChecked(false, false);
+		fTogglePeak->setChecked(true, false);
+		fToggleHigh->setChecked(false, false);
 		break;
 	}
 }
@@ -335,27 +338,27 @@ void ZamDynamicEQUI::imageSwitchClicked(ImageSwitch* tog, bool down)
     setParameterValue(tog->getId(), down ? 1.f : 0.f);
 }
 
-void ZamDynamicEQUI::imageSwitchClicked(ZamSwitch* tog, bool)
+void ZamDynamicEQUI::imageButtonClicked(ImageButton* tog, int)
 {
     setParameterValue(tog->getId(), 1.f);
     switch(tog->getId()) {
     case ZamDynamicEQPlugin::paramToggleLow:
         setParameterValue(ZamDynamicEQPlugin::paramToggleHigh, 0.f);
         setParameterValue(ZamDynamicEQPlugin::paramTogglePeak, 0.f);
-        fTogglePeak->setDown(false);
-        fToggleHigh->setDown(false);
+        fTogglePeak->setChecked(false, false);
+        fToggleHigh->setChecked(false, false);
         break;
     case ZamDynamicEQPlugin::paramTogglePeak:
         setParameterValue(ZamDynamicEQPlugin::paramToggleHigh, 0.f);
         setParameterValue(ZamDynamicEQPlugin::paramToggleLow, 0.f);
-        fToggleLow->setDown(false);
-        fToggleHigh->setDown(false);
+        fToggleLow->setChecked(false, false);
+        fToggleHigh->setChecked(false, false);
         break;
     case ZamDynamicEQPlugin::paramToggleHigh:
         setParameterValue(ZamDynamicEQPlugin::paramTogglePeak, 0.f);
         setParameterValue(ZamDynamicEQPlugin::paramToggleLow, 0.f);
-        fToggleLow->setDown(false);
-        fTogglePeak->setDown(false);
+        fToggleLow->setChecked(false, false);
+        fTogglePeak->setChecked(false, false);
         break;
     }
 }
@@ -477,10 +480,10 @@ void ZamDynamicEQUI::calceqcurve(float x[], float y[])
                 std::complex<double> exp2iw = std::polar(1.0, 2.0*theta);
                 double freqH;
 
-		if (fToggleLow->isDown()) {
+		if (fToggleLow->isChecked()) {
 			lowshelfeq(0.f,boostl,bwgaindbl,bwl,bwl,0.707f,Bl,Al);
                 	H = (1. + Al[1]*expiw + Al[2]*exp2iw)/(Bl[0] + Bl[1]*expiw + Bl[2]*exp2iw);
-		} else if (fTogglePeak->isDown()) {
+		} else if (fTogglePeak->isChecked()) {
 			peq(dcgain,boost2,bwgain2,w02,bw2,&a0y,&a1y,&a2y,&b0y,&b1y,&b2y,&gainy);
                 	H = (1. + a1y*expiw + a2y*exp2iw)/(b0y + b1y*expiw + b2y*exp2iw);
 		} else {
@@ -497,6 +500,8 @@ void ZamDynamicEQUI::calceqcurve(float x[], float y[])
 
 void ZamDynamicEQUI::onDisplay()
 {
+    const GraphicsContext& context(getGraphicsContext());
+
     calceqcurve(eqx, eqy);
 
     glClearColor(0.f, 0.f, 0.f, 0.f);
@@ -506,7 +511,7 @@ void ZamDynamicEQUI::onDisplay()
 
     glClear(GL_COLOR_BUFFER_BIT);
 
-    fImgBackground.draw();
+    fImgBackground.draw(context);
 
     int i;
     glLineWidth(1);
diff --git a/plugins/ZamDynamicEQ/ZamDynamicEQUI.hpp b/plugins/ZamDynamicEQ/ZamDynamicEQUI.hpp
index 343a3c7..73d4ef6 100644
--- a/plugins/ZamDynamicEQ/ZamDynamicEQUI.hpp
+++ b/plugins/ZamDynamicEQ/ZamDynamicEQUI.hpp
@@ -27,7 +27,6 @@
 
 using DGL::Image;
 using DGL::ZamKnob;
-using DGL::ZamSwitch;
 using DGL::ImageSwitch;
 using DGL::ImageSlider;
 
@@ -37,7 +36,7 @@ START_NAMESPACE_DISTRHO
 
 class ZamDynamicEQUI : public UI,
                         public ZamKnob::Callback,
-                        public ZamSwitch::Callback,
+                        public ImageButton::Callback,
                         public ImageSwitch::Callback
 {
 public:
@@ -57,7 +56,7 @@ protected:
     void imageKnobDragFinished(ZamKnob* knob) override;
     void imageKnobValueChanged(ZamKnob* knob, float value) override;
     void imageSwitchClicked(ImageSwitch* toggle, bool down) override;
-    void imageSwitchClicked(ZamSwitch* toggle, bool down) override;
+    void imageButtonClicked(ImageButton* toggle, int button) override;
 
     void onDisplay() override;
 
@@ -89,7 +88,7 @@ private:
     Image fImgBackground, fHighOnImg, fHighOffImg, fLowOnImg, fLowOffImg;
     Image fPeakOnImg, fPeakOffImg, fTogOffImg, fTogOnImg, fSliderEq;
 
-    ScopedPointer<ZamSwitch> fToggleLow, fTogglePeak, fToggleHigh;
+    ScopedPointer<ImageButton> fToggleLow, fTogglePeak, fToggleHigh;
     ScopedPointer<ImageSwitch> fToggleSidechain, fToggleBoostCut;
     ScopedPointer<ZamKnob> fKnobAttack, fKnobRelease;
     ScopedPointer<ZamKnob> fKnobThresh, fKnobRatio, fKnobKnee, fKnobTargetWidth;