diff --git a/Makefile b/Makefile index a548af5..dc799b9 100644 --- a/Makefile +++ b/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 diff --git a/dpf b/dpf index b5834a9..66aa0ee 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit b5834a9907918f5b183ae26e43cb0d47114e5c6d +Subproject commit 66aa0ee878ba4ca6feb85c29d3fcdad09e595f26 diff --git a/plugins/Nekobi/DistrhoUINekobi.cpp b/plugins/Nekobi/DistrhoUINekobi.cpp index 30a0f22..461db43 100644 --- a/plugins/Nekobi/DistrhoUINekobi.cpp +++ b/plugins/Nekobi/DistrhoUINekobi.cpp @@ -1,6 +1,6 @@ /* * DISTRHO Nekobi Plugin, based on Nekobee by Sean Bolton and others. - * Copyright (C) 2013-2015 Filipe Coelho + * Copyright (C) 2013-2021 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -34,7 +34,7 @@ DistrhoUINekobi::DistrhoUINekobi() fAboutWindow.setImage(aboutImage); // slider - Image sliderImage(Art::sliderData, Art::sliderWidth, Art::sliderHeight); + Image sliderImage(Art::sliderData, Art::sliderWidth, Art::sliderHeight, kImageFormatBGRA); fSliderWaveform = new ImageSlider(this, sliderImage); fSliderWaveform->setId(DistrhoPluginNekobi::paramWaveform); @@ -46,7 +46,7 @@ DistrhoUINekobi::DistrhoUINekobi() fSliderWaveform->setCallback(this); // knobs - Image knobImage(Art::knobData, Art::knobWidth, Art::knobHeight); + Image knobImage(Art::knobData, Art::knobWidth, Art::knobHeight, kImageFormatBGRA); // knob Tuning fKnobTuning = new ImageKnob(this, knobImage, ImageKnob::Vertical); @@ -119,8 +119,8 @@ DistrhoUINekobi::DistrhoUINekobi() fKnobVolume->setCallback(this); // about button - Image aboutImageNormal(Art::aboutButtonNormalData, Art::aboutButtonNormalWidth, Art::aboutButtonNormalHeight); - Image aboutImageHover(Art::aboutButtonHoverData, Art::aboutButtonHoverWidth, Art::aboutButtonHoverHeight); + Image aboutImageNormal(Art::aboutButtonNormalData, Art::aboutButtonNormalWidth, Art::aboutButtonNormalHeight, kImageFormatBGRA); + Image aboutImageHover(Art::aboutButtonHoverData, Art::aboutButtonHoverWidth, Art::aboutButtonHoverHeight, kImageFormatBGRA); fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover); fButtonAbout->setAbsolutePos(505, 5); fButtonAbout->setCallback(this); diff --git a/plugins/Nekobi/Makefile b/plugins/Nekobi/Makefile index e9b6de7..a8ec2fb 100644 --- a/plugins/Nekobi/Makefile +++ b/plugins/Nekobi/Makefile @@ -22,6 +22,7 @@ FILES_UI = \ # -------------------------------------------------------------- # Do some magic +UI_TYPE = generic include ../../dpf/Makefile.plugins.mk # --------------------------------------------------------------