Gordonjcp
/
nekobi-reworked
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow build against cairo or opengl 

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-06-14 14:18:31 +01:00
parent fee3b8f5b3
commit 825a5c6b5f
No known key found for this signature in database
GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

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

2
dpf

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

10
plugins/Nekobi/DistrhoUINekobi.cpp
View File

@ -1,6 +1,6 @@
/* /*
* DISTRHO Nekobi Plugin, based on Nekobee by Sean Bolton and others. * DISTRHO Nekobi Plugin, based on Nekobee by Sean Bolton and others.
* Copyright (C) 2013-2015 Filipe Coelho <falktx@falktx.com> * Copyright (C) 2013-2021 Filipe Coelho <falktx@falktx.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@ -34,7 +34,7 @@ DistrhoUINekobi::DistrhoUINekobi()
fAboutWindow.setImage(aboutImage); fAboutWindow.setImage(aboutImage);
// slider // slider
Image sliderImage(Art::sliderData, Art::sliderWidth, Art::sliderHeight); Image sliderImage(Art::sliderData, Art::sliderWidth, Art::sliderHeight, kImageFormatBGRA);
fSliderWaveform = new ImageSlider(this, sliderImage); fSliderWaveform = new ImageSlider(this, sliderImage);
fSliderWaveform->setId(DistrhoPluginNekobi::paramWaveform); fSliderWaveform->setId(DistrhoPluginNekobi::paramWaveform);
@ -46,7 +46,7 @@ DistrhoUINekobi::DistrhoUINekobi()
fSliderWaveform->setCallback(this); fSliderWaveform->setCallback(this);
// knobs // knobs
Image knobImage(Art::knobData, Art::knobWidth, Art::knobHeight); Image knobImage(Art::knobData, Art::knobWidth, Art::knobHeight, kImageFormatBGRA);
// knob Tuning // knob Tuning
fKnobTuning = new ImageKnob(this, knobImage, ImageKnob::Vertical); fKnobTuning = new ImageKnob(this, knobImage, ImageKnob::Vertical);
@ -119,8 +119,8 @@ DistrhoUINekobi::DistrhoUINekobi()
fKnobVolume->setCallback(this); fKnobVolume->setCallback(this);
// about button // about button
Image aboutImageNormal(Art::aboutButtonNormalData, Art::aboutButtonNormalWidth, Art::aboutButtonNormalHeight); Image aboutImageNormal(Art::aboutButtonNormalData, Art::aboutButtonNormalWidth, Art::aboutButtonNormalHeight, kImageFormatBGRA);
Image aboutImageHover(Art::aboutButtonHoverData, Art::aboutButtonHoverWidth, Art::aboutButtonHoverHeight); Image aboutImageHover(Art::aboutButtonHoverData, Art::aboutButtonHoverWidth, Art::aboutButtonHoverHeight, kImageFormatBGRA);
fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover); fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover);
fButtonAbout->setAbsolutePos(505, 5); fButtonAbout->setAbsolutePos(505, 5);
fButtonAbout->setCallback(this); fButtonAbout->setCallback(this);

1
plugins/Nekobi/Makefile
View File

@ -22,6 +22,7 @@ FILES_UI = \
# -------------------------------------------------------------- # --------------------------------------------------------------
# Do some magic # Do some magic
UI_TYPE = generic
include ../../dpf/Makefile.plugins.mk include ../../dpf/Makefile.plugins.mk
# -------------------------------------------------------------- # --------------------------------------------------------------