diff --git a/dpf b/dpf index 053854d..aa59259 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 053854daf007c4aeeda43c26de124181e6187cf2 +Subproject commit aa5925952ce757f2e81a50db062d37eb39552340 diff --git a/plugins/3BandEQ/DistrhoUI3BandEQ.cpp b/plugins/3BandEQ/DistrhoUI3BandEQ.cpp index 452f1fe..9f9621c 100644 --- a/plugins/3BandEQ/DistrhoUI3BandEQ.cpp +++ b/plugins/3BandEQ/DistrhoUI3BandEQ.cpp @@ -21,24 +21,21 @@ using DGL::Point; START_NAMESPACE_DISTRHO +namespace Artwork = DistrhoArtwork3BandEQ; + // ----------------------------------------------------------------------- DistrhoUI3BandEQ::DistrhoUI3BandEQ() - : UI(), + : UI(Artwork::backgroundWidth, Artwork::backgroundHeight), + fImgBackground(Artwork::backgroundData, Artwork::backgroundWidth, Artwork::backgroundHeight, GL_BGR), fAboutWindow(this) { - // set UI size - setSize(DistrhoArtwork3BandEQ::backgroundWidth, DistrhoArtwork3BandEQ::backgroundHeight); - - // background - fImgBackground = Image(DistrhoArtwork3BandEQ::backgroundData, DistrhoArtwork3BandEQ::backgroundWidth, DistrhoArtwork3BandEQ::backgroundHeight, GL_BGR); - // about - Image aboutImage(DistrhoArtwork3BandEQ::aboutData, DistrhoArtwork3BandEQ::aboutWidth, DistrhoArtwork3BandEQ::aboutHeight, GL_BGR); + Image aboutImage(Artwork::aboutData, Artwork::aboutWidth, Artwork::aboutHeight, GL_BGR); fAboutWindow.setImage(aboutImage); // sliders - Image sliderImage(DistrhoArtwork3BandEQ::sliderData, DistrhoArtwork3BandEQ::sliderWidth, DistrhoArtwork3BandEQ::sliderHeight); + Image sliderImage(Artwork::sliderData, Artwork::sliderWidth, Artwork::sliderHeight); Point sliderPosStart(57, 43); Point sliderPosEnd(57, 43 + 160); @@ -76,7 +73,7 @@ DistrhoUI3BandEQ::DistrhoUI3BandEQ() fSliderMaster->setEndPos(sliderPosEnd); // knobs - Image knobImage(DistrhoArtwork3BandEQ::knobData, DistrhoArtwork3BandEQ::knobWidth, DistrhoArtwork3BandEQ::knobHeight); + Image knobImage(Artwork::knobData, Artwork::knobWidth, Artwork::knobHeight); // knob Low-Mid fKnobLowMid = new ImageKnob(this, knobImage, ImageKnob::Vertical); @@ -97,8 +94,8 @@ DistrhoUI3BandEQ::DistrhoUI3BandEQ() fKnobMidHigh->setCallback(this); // about button - Image aboutImageNormal(DistrhoArtwork3BandEQ::aboutButtonNormalData, DistrhoArtwork3BandEQ::aboutButtonNormalWidth, DistrhoArtwork3BandEQ::aboutButtonNormalHeight); - Image aboutImageHover(DistrhoArtwork3BandEQ::aboutButtonHoverData, DistrhoArtwork3BandEQ::aboutButtonHoverWidth, DistrhoArtwork3BandEQ::aboutButtonHoverHeight); + Image aboutImageNormal(Artwork::aboutButtonNormalData, Artwork::aboutButtonNormalWidth, Artwork::aboutButtonNormalHeight); + Image aboutImageHover(Artwork::aboutButtonHoverData, Artwork::aboutButtonHoverWidth, Artwork::aboutButtonHoverHeight); fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover); fButtonAbout->setAbsolutePos(264, 300); fButtonAbout->setCallback(this); diff --git a/plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp b/plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp index 6ad0f01..6efd63e 100644 --- a/plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp +++ b/plugins/3BandSplitter/DistrhoUI3BandSplitter.cpp @@ -21,24 +21,21 @@ using DGL::Point; START_NAMESPACE_DISTRHO +namespace Artwork = DistrhoArtwork3BandSplitter; + // ----------------------------------------------------------------------- DistrhoUI3BandSplitter::DistrhoUI3BandSplitter() - : UI(), + : UI(Artwork::backgroundWidth, Artwork::backgroundHeight), + fImgBackground(Artwork::backgroundData, Artwork::backgroundWidth, Artwork::backgroundHeight, GL_BGR), fAboutWindow(this) { - // set UI size - setSize(DistrhoArtwork3BandSplitter::backgroundWidth, DistrhoArtwork3BandSplitter::backgroundHeight); - - // background - fImgBackground = Image(DistrhoArtwork3BandSplitter::backgroundData, DistrhoArtwork3BandSplitter::backgroundWidth, DistrhoArtwork3BandSplitter::backgroundHeight, GL_BGR); - // about - Image aboutImage(DistrhoArtwork3BandSplitter::aboutData, DistrhoArtwork3BandSplitter::aboutWidth, DistrhoArtwork3BandSplitter::aboutHeight, GL_BGR); + Image aboutImage(Artwork::aboutData, Artwork::aboutWidth, Artwork::aboutHeight, GL_BGR); fAboutWindow.setImage(aboutImage); // sliders - Image sliderImage(DistrhoArtwork3BandSplitter::sliderData, DistrhoArtwork3BandSplitter::sliderWidth, DistrhoArtwork3BandSplitter::sliderHeight); + Image sliderImage(Artwork::sliderData, Artwork::sliderWidth, Artwork::sliderHeight); Point sliderPosStart(57, 43); Point sliderPosEnd(57, 43 + 160); @@ -76,7 +73,7 @@ DistrhoUI3BandSplitter::DistrhoUI3BandSplitter() fSliderMaster->setEndPos(sliderPosEnd); // knobs - Image knobImage(DistrhoArtwork3BandSplitter::knobData, DistrhoArtwork3BandSplitter::knobWidth, DistrhoArtwork3BandSplitter::knobHeight); + Image knobImage(Artwork::knobData, Artwork::knobWidth, Artwork::knobHeight); // knob Low-Mid fKnobLowMid = new ImageKnob(this, knobImage, ImageKnob::Vertical); @@ -97,8 +94,8 @@ DistrhoUI3BandSplitter::DistrhoUI3BandSplitter() fKnobMidHigh->setCallback(this); // about button - Image aboutImageNormal(DistrhoArtwork3BandSplitter::aboutButtonNormalData, DistrhoArtwork3BandSplitter::aboutButtonNormalWidth, DistrhoArtwork3BandSplitter::aboutButtonNormalHeight); - Image aboutImageHover(DistrhoArtwork3BandSplitter::aboutButtonHoverData, DistrhoArtwork3BandSplitter::aboutButtonHoverWidth, DistrhoArtwork3BandSplitter::aboutButtonHoverHeight); + Image aboutImageNormal(Artwork::aboutButtonNormalData, Artwork::aboutButtonNormalWidth, Artwork::aboutButtonNormalHeight); + Image aboutImageHover(Artwork::aboutButtonHoverData, Artwork::aboutButtonHoverWidth, Artwork::aboutButtonHoverHeight); fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover); fButtonAbout->setAbsolutePos(264, 300); fButtonAbout->setCallback(this); diff --git a/plugins/PingPongPan/DistrhoUIPingPongPan.cpp b/plugins/PingPongPan/DistrhoUIPingPongPan.cpp index 85a0ee5..a005ba1 100644 --- a/plugins/PingPongPan/DistrhoUIPingPongPan.cpp +++ b/plugins/PingPongPan/DistrhoUIPingPongPan.cpp @@ -19,23 +19,21 @@ START_NAMESPACE_DISTRHO +namespace Artwork = DistrhoArtworkPingPongPan; + // ----------------------------------------------------------------------- DistrhoUIPingPongPan::DistrhoUIPingPongPan() - : UI(), + : UI(Artwork::backgroundWidth, Artwork::backgroundHeight), + fImgBackground(Artwork::backgroundData, Artwork::backgroundWidth, Artwork::backgroundHeight, GL_BGR), fAboutWindow(this) { - // set UI size - setSize(DistrhoArtworkPingPongPan::backgroundWidth, DistrhoArtworkPingPongPan::backgroundHeight); - - // background - fImgBackground = Image(DistrhoArtworkPingPongPan::backgroundData, DistrhoArtworkPingPongPan::backgroundWidth, DistrhoArtworkPingPongPan::backgroundHeight, GL_BGR); - - Image imageAbout(DistrhoArtworkPingPongPan::aboutData, DistrhoArtworkPingPongPan::aboutWidth, DistrhoArtworkPingPongPan::aboutHeight, GL_BGR); + // about + Image imageAbout(Artwork::aboutData, Artwork::aboutWidth, Artwork::aboutHeight, GL_BGR); fAboutWindow.setImage(imageAbout); // knobs - Image knobImage(DistrhoArtworkPingPongPan::knobData, DistrhoArtworkPingPongPan::knobWidth, DistrhoArtworkPingPongPan::knobHeight); + Image knobImage(Artwork::knobData, Artwork::knobWidth, Artwork::knobHeight); // knob Low-Mid fKnobFreq = new ImageKnob(this, knobImage, ImageKnob::Vertical); @@ -56,8 +54,8 @@ DistrhoUIPingPongPan::DistrhoUIPingPongPan() fKnobWidth->setCallback(this); // about button - Image aboutImageNormal(DistrhoArtworkPingPongPan::aboutButtonNormalData, DistrhoArtworkPingPongPan::aboutButtonNormalWidth, DistrhoArtworkPingPongPan::aboutButtonNormalHeight); - Image aboutImageHover(DistrhoArtworkPingPongPan::aboutButtonHoverData, DistrhoArtworkPingPongPan::aboutButtonHoverWidth, DistrhoArtworkPingPongPan::aboutButtonHoverHeight); + Image aboutImageNormal(Artwork::aboutButtonNormalData, Artwork::aboutButtonNormalWidth, Artwork::aboutButtonNormalHeight); + Image aboutImageHover(Artwork::aboutButtonHoverData, Artwork::aboutButtonHoverWidth, Artwork::aboutButtonHoverHeight); fButtonAbout = new ImageButton(this, aboutImageNormal, aboutImageHover, aboutImageHover); fButtonAbout->setAbsolutePos(183, 8); fButtonAbout->setCallback(this);