Update to latest DPF, make UI generic

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

Makefile

@@ -11,7 +11,7 @@ all: dgl plugins gen
 # --------------------------------------------------------------
 
 dgl:
-ifeq ($(HAVE_DGL),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
 	$(MAKE) -C dpf/dgl
 endif
 

dpf

@@ -1 +1 @@
-Subproject commit eb1ec93eedb24e33c5e6d8442d7f2d1bd7038a13
+Subproject commit 66aa0ee878ba4ca6feb85c29d3fcdad09e595f26

plugins/AmplitudeImposer/DistrhoUIAmplitudeImposer.cpp

@@ -33,10 +33,10 @@ namespace Art = DistrhoArtworkAmplitudeImposer;
 
 DistrhoUIAmplitudeImposer::DistrhoUIAmplitudeImposer()
     : UI(Art::backWidth, Art::backHeight),
-      fImgBackground(Art::backData, Art::backWidth, Art::backHeight, GL_LUMINANCE)
+      fImgBackground(Art::backData, Art::backWidth, Art::backHeight, kImageFormatGrayscale)
 {
     // sliders
-    Image sliderImage(Art::sliderData, Art::sliderWidth, Art::sliderHeight, GL_LUMINANCE);
+    Image sliderImage(Art::sliderData, Art::sliderWidth, Art::sliderHeight, kImageFormatGrayscale);
 
     fSliderDepth = new ImageSlider(this, sliderImage);
     fSliderDepth->setId(DistrhoPluginAmplitudeImposer::kParameterDepth);
@@ -101,7 +101,9 @@ void DistrhoUIAmplitudeImposer::imageSliderValueChanged(ImageSlider* slider, flo
 
 void DistrhoUIAmplitudeImposer::onDisplay()
 {
-    fImgBackground.draw();
+    const GraphicsContext& context(getGraphicsContext());
+
+    fImgBackground.draw(context);
 }
 
 // -----------------------------------------------------------------------

plugins/AmplitudeImposer/Makefile

@@ -22,25 +22,23 @@ FILES_UI  = \
 # --------------------------------------------------------------
 # Do some magic
 
+UI_TYPE = generic
 include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
-
 TARGETS += ladspa
 TARGETS += vst
 
-ifeq ($(HAVE_DGL),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
 
-ifeq ($(HAVE_DGL),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp

plugins/CycleShifter/DistrhoUICycleShifter.cpp

@@ -33,10 +33,10 @@ namespace Art = DistrhoArtworkCycleShifter;
 
 DistrhoUICycleShifter::DistrhoUICycleShifter()
     : UI(Art::backWidth, Art::backHeight),
-      fImgBackground(Art::backData, Art::backWidth, Art::backHeight, GL_LUMINANCE)
+      fImgBackground(Art::backData, Art::backWidth, Art::backHeight, kImageFormatGrayscale)
 {
     // sliders
-    Image sliderImage(Art::sliderData, Art::sliderWidth, Art::sliderHeight, GL_LUMINANCE);
+    Image sliderImage(Art::sliderData, Art::sliderWidth, Art::sliderHeight, kImageFormatGrayscale);
 
     fSliderNewCycleVol = new ImageSlider(this, sliderImage);
     fSliderNewCycleVol->setId(DistrhoPluginCycleShifter::kParameterNewCycleVolume);
@@ -101,7 +101,9 @@ void DistrhoUICycleShifter::imageSliderValueChanged(ImageSlider* slider, float v
 
 void DistrhoUICycleShifter::onDisplay()
 {
-    fImgBackground.draw();
+    const GraphicsContext& context(getGraphicsContext());
+
+    fImgBackground.draw(context);
 }
 
 // -----------------------------------------------------------------------

plugins/CycleShifter/Makefile

@@ -22,25 +22,23 @@ FILES_UI  = \
 # --------------------------------------------------------------
 # Do some magic
 
+UI_TYPE = generic
 include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
-
 TARGETS += ladspa
 TARGETS += vst
 
-ifeq ($(HAVE_DGL),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
 
-ifeq ($(HAVE_DGL),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp

plugins/SoulForce/DistrhoUISoulForce.cpp

@@ -33,14 +33,14 @@ namespace Art = DistrhoArtworkSoulForce;
 
 DistrhoUISoulForce::DistrhoUISoulForce()
     : UI(Art::backgroundWidth, Art::backgroundHeight),
-      fImgBackground(Art::backgroundData, Art::backgroundWidth, Art::backgroundHeight, GL_BGR),
-      fImgLedOff(Art::led_offData, Art::led_offWidth, Art::led_offHeight, GL_BGR),
-      fImgLedOn(Art::led_onData, Art::led_onWidth, Art::led_onHeight, GL_BGR),
+      fImgBackground(Art::backgroundData, Art::backgroundWidth, Art::backgroundHeight, kImageFormatBGR),
+      fImgLedOff(Art::led_offData, Art::led_offWidth, Art::led_offHeight, kImageFormatBGR),
+      fImgLedOn(Art::led_onData, Art::led_onWidth, Art::led_onHeight, kImageFormatBGR),
       fFootDown(true)
 {
     // knobs
     fKnobShape = new ImageKnob(this,
-                     Image(Art::knob_shapeData, Art::knob_shapeWidth, Art::knob_shapeHeight, GL_BGR));
+                     Image(Art::knob_shapeData, Art::knob_shapeWidth, Art::knob_shapeHeight, kImageFormatBGR));
     fKnobShape->setId(DistrhoPluginSoulForce::kParameterShape);
     fKnobShape->setAbsolutePos(17, 64);
     fKnobShape->setRange(0.0f, 1.0f);
@@ -49,7 +49,7 @@ DistrhoUISoulForce::DistrhoUISoulForce()
     fKnobShape->setCallback(this);
 
     fKnobFBack = new ImageKnob(this,
-                     Image(Art::knob_feedbackData, Art::knob_feedbackWidth, Art::knob_feedbackHeight, GL_BGR));
+                     Image(Art::knob_feedbackData, Art::knob_feedbackWidth, Art::knob_feedbackHeight, kImageFormatBGR));
     fKnobFBack->setId(DistrhoPluginSoulForce::kParameterFeedback);
     fKnobFBack->setAbsolutePos(176, 64);
     fKnobFBack->setRange(0.0f, 1.0f);
@@ -59,17 +59,17 @@ DistrhoUISoulForce::DistrhoUISoulForce()
 
     // switches
     fSwitchSource = new ImageSwitch(this,
-                        Image(Art::switch_leftData, Art::switch_leftWidth, Art::switch_leftHeight, GL_BGR),
-                        Image(Art::switch_rightData, Art::switch_rightWidth, Art::switch_rightHeight, GL_BGR));
+                        Image(Art::switch_leftData, Art::switch_leftWidth, Art::switch_leftHeight, kImageFormatBGR),
+                        Image(Art::switch_rightData, Art::switch_rightWidth, Art::switch_rightHeight, kImageFormatBGR));
     fSwitchSource->setId(DistrhoPluginSoulForce::kParameterSource);
     fSwitchSource->setAbsolutePos(116, 191);
     fSwitchSource->setCallback(this);
 
     // buttons
     fButtonFoot = new ImageButton(this,
-                      Image(Art::button_upData, Art::button_upWidth, Art::button_upHeight, GL_BGR),
-                      Image(Art::button_upData, Art::button_upWidth, Art::button_upHeight, GL_BGR),
-                      Image(Art::button_downData, Art::button_downWidth, Art::button_downHeight, GL_BGR));
+                      Image(Art::button_upData, Art::button_upWidth, Art::button_upHeight, kImageFormatBGR),
+                      Image(Art::button_upData, Art::button_upWidth, Art::button_upHeight, kImageFormatBGR),
+                      Image(Art::button_downData, Art::button_downWidth, Art::button_downHeight, kImageFormatBGR));
     fButtonFoot->setId(DistrhoPluginSoulForce::kParameterFootswitch);
     fButtonFoot->setAbsolutePos(125, 282);
     fButtonFoot->setCallback(this);
@@ -208,12 +208,14 @@ void DistrhoUISoulForce::imageSwitchClicked(ImageSwitch* imageSwitch, bool down)
 
 void DistrhoUISoulForce::onDisplay()
 {
-    fImgBackground.draw();
+    const GraphicsContext& context(getGraphicsContext());
+
+    fImgBackground.draw(context);
 
     if (fFootDown)
-        fImgLedOn.drawAt(123, 240);
+        fImgLedOn.drawAt(context, 123, 240);
     else
-        fImgLedOff.drawAt(123, 240);
+        fImgLedOff.drawAt(context, 123, 240);
 }
 
 // -----------------------------------------------------------------------

plugins/SoulForce/Makefile

@@ -22,25 +22,23 @@ FILES_UI  = \
 # --------------------------------------------------------------
 # Do some magic
 
+UI_TYPE = generic
 include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
-
 TARGETS += ladspa
 TARGETS += vst
 
-ifeq ($(HAVE_DGL),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
 endif
 endif
 
-ifeq ($(HAVE_DGL),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
 TARGETS += lv2_sep
 else
 TARGETS += lv2_dsp