DISTRHO
/
JuicePlugins
mirror of https://github.com/DISTRHO/JuicePlugins
1
0
Fork 0
Code Issues 0 Releases 0 Wiki Activity
Browse Source

Make Trigger and Wobble buildable with cairo

master
falkTX 3 years ago
parent
824e9692cc
commit
78a0d769da
10 changed files with 22 additions and 40 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      Makefile
  2. +1
    -1
      dpf
  3. +0
    -4
      plugins/PowerJuice/Makefile
  4. +0
    -4
      plugins/PowerJuiceX2/Makefile
  5. +0
    -4
      plugins/StutterJuice/Makefile
  6. +1
    -4
      plugins/TriggerJuice/Makefile
  7. +10
    -8
      plugins/TriggerJuice/TriggerJuiceUI.cpp
  8. +0
    -4
      plugins/VectorJuice/Makefile
  9. +1
    -4
      plugins/WobbleJuice/Makefile
  10. +8
    -6
      plugins/WobbleJuice/WobbleJuiceUI.cpp

+ 1
- 1
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




+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 7688dd9602c5b770ff1b025c555d4f1f8edb7a2e
Subproject commit 5709c0e4e573921e3fe90a54113f57885f4e4340

+ 0
- 4
plugins/PowerJuice/Makefile View File

@@ -27,10 +27,6 @@ include ../../dpf/Makefile.plugins.mk
# -------------------------------------------------------------- # --------------------------------------------------------------
# Enable all possible plugin types # Enable all possible plugin types


ifeq ($(LINUX),true)
all: jack lv2 vst all: jack lv2 vst
else
all: lv2 vst
endif


# -------------------------------------------------------------- # --------------------------------------------------------------

+ 0
- 4
plugins/PowerJuiceX2/Makefile View File

@@ -27,10 +27,6 @@ include ../../dpf/Makefile.plugins.mk
# -------------------------------------------------------------- # --------------------------------------------------------------
# Enable all possible plugin types # Enable all possible plugin types


ifeq ($(LINUX),true)
all: jack lv2 vst all: jack lv2 vst
else
all: lv2 vst
endif


# -------------------------------------------------------------- # --------------------------------------------------------------

+ 0
- 4
plugins/StutterJuice/Makefile View File

@@ -27,10 +27,6 @@ include ../../dpf/Makefile.plugins.mk
# -------------------------------------------------------------- # --------------------------------------------------------------
# Enable all possible plugin types # Enable all possible plugin types


ifeq ($(LINUX),true)
all: jack lv2_sep vst all: jack lv2_sep vst
else
all: lv2_sep vst
endif


# -------------------------------------------------------------- # --------------------------------------------------------------

+ 1
- 4
plugins/TriggerJuice/Makefile View File

@@ -22,15 +22,12 @@ FILES_UI = \
# -------------------------------------------------------------- # --------------------------------------------------------------
# Do some magic # Do some magic


UI_TYPE=generic
include ../../dpf/Makefile.plugins.mk include ../../dpf/Makefile.plugins.mk


# -------------------------------------------------------------- # --------------------------------------------------------------
# Enable all possible plugin types # Enable all possible plugin types


ifeq ($(LINUX),true)
all: jack lv2_sep vst all: jack lv2_sep vst
else
all: lv2_sep vst
endif


# -------------------------------------------------------------- # --------------------------------------------------------------

+ 10
- 8
plugins/TriggerJuice/TriggerJuiceUI.cpp View File

@@ -31,21 +31,21 @@ TriggerJuiceUI::TriggerJuiceUI()
fAboutWindow(this) fAboutWindow(this)
{ {
// background // background
fImgBackground = Image(TriggerJuiceArtwork::backgroundData, TriggerJuiceArtwork::backgroundWidth, TriggerJuiceArtwork::backgroundHeight, GL_BGRA);
fImgBackground = Image(TriggerJuiceArtwork::backgroundData, TriggerJuiceArtwork::backgroundWidth, TriggerJuiceArtwork::backgroundHeight, kImageFormatBGRA);


// about // about
Image imageAbout(TriggerJuiceArtwork::aboutData, TriggerJuiceArtwork::aboutWidth, TriggerJuiceArtwork::aboutHeight, GL_BGRA);
Image imageAbout(TriggerJuiceArtwork::aboutData, TriggerJuiceArtwork::aboutWidth, TriggerJuiceArtwork::aboutHeight, kImageFormatBGRA);
fAboutWindow.setImage(imageAbout); fAboutWindow.setImage(imageAbout);


// about button // about button
Image aboutImageNormal(TriggerJuiceArtwork::aboutButtonNormalData, TriggerJuiceArtwork::aboutButtonNormalWidth, TriggerJuiceArtwork::aboutButtonNormalHeight);
Image aboutImageHover(TriggerJuiceArtwork::aboutButtonHoverData, TriggerJuiceArtwork::aboutButtonHoverWidth, TriggerJuiceArtwork::aboutButtonHoverHeight);
Image aboutImageNormal(TriggerJuiceArtwork::aboutButtonNormalData, TriggerJuiceArtwork::aboutButtonNormalWidth, TriggerJuiceArtwork::aboutButtonNormalHeight, kImageFormatBGRA);
Image aboutImageHover(TriggerJuiceArtwork::aboutButtonHoverData, TriggerJuiceArtwork::aboutButtonHoverWidth, TriggerJuiceArtwork::aboutButtonHoverHeight, kImageFormatBGRA);
fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover); fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover);
fButtonAbout->setAbsolutePos(358, 17); fButtonAbout->setAbsolutePos(358, 17);
fButtonAbout->setCallback(this); fButtonAbout->setCallback(this);


// knobs // knobs
Image knobImage(TriggerJuiceArtwork::knobData, TriggerJuiceArtwork::knobWidth, TriggerJuiceArtwork::knobHeight);
Image knobImage(TriggerJuiceArtwork::knobData, TriggerJuiceArtwork::knobWidth, TriggerJuiceArtwork::knobHeight, kImageFormatBGRA);


// knob KnobAttack // knob KnobAttack
fKnobAttack = new ImageKnob(this, knobImage); fKnobAttack = new ImageKnob(this, knobImage);
@@ -64,7 +64,7 @@ TriggerJuiceUI::TriggerJuiceUI()
fKnobRelease->setCallback(this); fKnobRelease->setCallback(this);


// sliders // sliders
Image sliderImage(TriggerJuiceArtwork::sliderData, TriggerJuiceArtwork::sliderWidth, TriggerJuiceArtwork::sliderHeight);
Image sliderImage(TriggerJuiceArtwork::sliderData, TriggerJuiceArtwork::sliderWidth, TriggerJuiceArtwork::sliderHeight, kImageFormatBGRA);
Point<int> sliderPosStart(293, 74); Point<int> sliderPosStart(293, 74);
Point<int> sliderPosEnd(293+11, 74); Point<int> sliderPosEnd(293+11, 74);


@@ -146,7 +146,7 @@ void TriggerJuiceUI::imageButtonClicked(ImageButton* button, int)
if (button != fButtonAbout) if (button != fButtonAbout)
return; return;


fAboutWindow.exec();
fAboutWindow.runAsModal();
} }


void TriggerJuiceUI::imageKnobDragStarted(ImageKnob* knob) void TriggerJuiceUI::imageKnobDragStarted(ImageKnob* knob)
@@ -205,7 +205,9 @@ void TriggerJuiceUI::imageSliderValueChanged(ImageSlider* slider, float value)


void TriggerJuiceUI::onDisplay() void TriggerJuiceUI::onDisplay()
{ {
fImgBackground.draw();
const GraphicsContext& context(getGraphicsContext());

fImgBackground.draw(context);
} }


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------


+ 0
- 4
plugins/VectorJuice/Makefile View File

@@ -27,10 +27,6 @@ include ../../dpf/Makefile.plugins.mk
# -------------------------------------------------------------- # --------------------------------------------------------------
# Enable all possible plugin types # Enable all possible plugin types


ifeq ($(LINUX),true)
all: jack lv2_sep vst all: jack lv2_sep vst
else
all: lv2_sep vst
endif


# -------------------------------------------------------------- # --------------------------------------------------------------

+ 1
- 4
plugins/WobbleJuice/Makefile View File

@@ -22,15 +22,12 @@ FILES_UI = \
# -------------------------------------------------------------- # --------------------------------------------------------------
# Do some magic # Do some magic


UI_TYPE=generic
include ../../dpf/Makefile.plugins.mk include ../../dpf/Makefile.plugins.mk


# -------------------------------------------------------------- # --------------------------------------------------------------
# Enable all possible plugin types # Enable all possible plugin types


ifeq ($(LINUX),true)
all: jack lv2_sep vst all: jack lv2_sep vst
else
all: lv2_sep vst
endif


# -------------------------------------------------------------- # --------------------------------------------------------------

+ 8
- 6
plugins/WobbleJuice/WobbleJuiceUI.cpp View File

@@ -29,14 +29,14 @@ WobbleJuiceUI::WobbleJuiceUI()
setSize(WobbleJuiceArtwork::backgroundWidth, WobbleJuiceArtwork::backgroundHeight); setSize(WobbleJuiceArtwork::backgroundWidth, WobbleJuiceArtwork::backgroundHeight);


// background // background
fImgBackground = Image(WobbleJuiceArtwork::backgroundData, WobbleJuiceArtwork::backgroundWidth, WobbleJuiceArtwork::backgroundHeight, GL_BGR);
fImgBackground = Image(WobbleJuiceArtwork::backgroundData, WobbleJuiceArtwork::backgroundWidth, WobbleJuiceArtwork::backgroundHeight, kImageFormatBGR);


// about // about
Image aboutImage(WobbleJuiceArtwork::aboutData, WobbleJuiceArtwork::aboutWidth, WobbleJuiceArtwork::aboutHeight, GL_BGR);
Image aboutImage(WobbleJuiceArtwork::aboutData, WobbleJuiceArtwork::aboutWidth, WobbleJuiceArtwork::aboutHeight, kImageFormatBGR);
fAboutWindow.setImage(aboutImage); fAboutWindow.setImage(aboutImage);


// knobs // knobs
Image knobImage(WobbleJuiceArtwork::knobData, WobbleJuiceArtwork::knobWidth, WobbleJuiceArtwork::knobHeight);
Image knobImage(WobbleJuiceArtwork::knobData, WobbleJuiceArtwork::knobWidth, WobbleJuiceArtwork::knobHeight, kImageFormatBGRA);


// knob Division // knob Division
fKnobDivision = new ImageKnob(this, knobImage, ImageKnob::Vertical); fKnobDivision = new ImageKnob(this, knobImage, ImageKnob::Vertical);
@@ -94,8 +94,8 @@ WobbleJuiceUI::WobbleJuiceUI()
fKnobDrive->setCallback(this); fKnobDrive->setCallback(this);


// about button // about button
Image aboutImageNormal(WobbleJuiceArtwork::aboutButtonNormalData, WobbleJuiceArtwork::aboutButtonNormalWidth, WobbleJuiceArtwork::aboutButtonNormalHeight);
Image aboutImageHover(WobbleJuiceArtwork::aboutButtonHoverData, WobbleJuiceArtwork::aboutButtonHoverWidth, WobbleJuiceArtwork::aboutButtonHoverHeight);
Image aboutImageNormal(WobbleJuiceArtwork::aboutButtonNormalData, WobbleJuiceArtwork::aboutButtonNormalWidth, WobbleJuiceArtwork::aboutButtonNormalHeight, kImageFormatBGRA);
Image aboutImageHover(WobbleJuiceArtwork::aboutButtonHoverData, WobbleJuiceArtwork::aboutButtonHoverWidth, WobbleJuiceArtwork::aboutButtonHoverHeight, kImageFormatBGRA);
fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover); fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover);
fButtonAbout->setAbsolutePos(390, 20); fButtonAbout->setAbsolutePos(390, 20);
fButtonAbout->setCallback(this); fButtonAbout->setCallback(this);
@@ -174,7 +174,9 @@ void WobbleJuiceUI::imageKnobValueChanged(ImageKnob* knob, float value)


void WobbleJuiceUI::onDisplay() void WobbleJuiceUI::onDisplay()
{ {
fImgBackground.draw();
const GraphicsContext& context(getGraphicsContext());

fImgBackground.draw(context);
} }


// ----------------------------------------------------------------------- // -----------------------------------------------------------------------


Write Preview
Loading…
Cancel
Save