Browse Source

Don't use about-dialogs in dpf plugins on osx, fixme later

tags/1.9.6
falkTX 9 years ago
parent
commit
257d494a3a
12 changed files with 60 additions and 12 deletions
  1. +8
    -2
      source/native-plugins/distrho-3bandeq/DistrhoUI3BandEQ.cpp
  2. +2
    -0
      source/native-plugins/distrho-3bandeq/DistrhoUI3BandEQ.hpp
  3. +8
    -2
      source/native-plugins/distrho-3bandsplitter/DistrhoUI3BandSplitter.cpp
  4. +2
    -0
      source/native-plugins/distrho-3bandsplitter/DistrhoUI3BandSplitter.hpp
  5. +8
    -2
      source/native-plugins/distrho-nekobi/DistrhoUINekobi.cpp
  6. +2
    -0
      source/native-plugins/distrho-nekobi/DistrhoUINekobi.hpp
  7. +8
    -2
      source/native-plugins/distrho-pingpongpan/DistrhoUIPingPongPan.cpp
  8. +2
    -0
      source/native-plugins/distrho-pingpongpan/DistrhoUIPingPongPan.hpp
  9. +8
    -2
      source/native-plugins/distrho-vectorjuice/VectorJuiceUI.cpp
  10. +2
    -0
      source/native-plugins/distrho-vectorjuice/VectorJuiceUI.hpp
  11. +8
    -2
      source/native-plugins/distrho-wobblejuice/WobbleJuiceUI.cpp
  12. +2
    -0
      source/native-plugins/distrho-wobblejuice/WobbleJuiceUI.hpp

+ 8
- 2
source/native-plugins/distrho-3bandeq/DistrhoUI3BandEQ.cpp View File

@@ -24,8 +24,10 @@ START_NAMESPACE_DISTRHO
// -----------------------------------------------------------------------

DistrhoUI3BandEQ::DistrhoUI3BandEQ()
: UI(),
fAboutWindow(this)
: UI()
#ifndef DISTRHO_OS_MAC
, fAboutWindow(this)
#endif
{
// set UI size
setSize(DistrhoArtwork3BandEQ::backgroundWidth, DistrhoArtwork3BandEQ::backgroundHeight);
@@ -33,9 +35,11 @@ DistrhoUI3BandEQ::DistrhoUI3BandEQ()
// background
fImgBackground = Image(DistrhoArtwork3BandEQ::backgroundData, DistrhoArtwork3BandEQ::backgroundWidth, DistrhoArtwork3BandEQ::backgroundHeight, GL_BGR);

#ifndef DISTRHO_OS_MAC
// about
Image aboutImage(DistrhoArtwork3BandEQ::aboutData, DistrhoArtwork3BandEQ::aboutWidth, DistrhoArtwork3BandEQ::aboutHeight, GL_BGR);
fAboutWindow.setImage(aboutImage);
#endif

// sliders
Image sliderImage(DistrhoArtwork3BandEQ::sliderData, DistrhoArtwork3BandEQ::sliderWidth, DistrhoArtwork3BandEQ::sliderHeight);
@@ -157,7 +161,9 @@ void DistrhoUI3BandEQ::imageButtonClicked(ImageButton* button, int)
if (button != fButtonAbout)
return;

#ifndef DISTRHO_OS_MAC
fAboutWindow.exec();
#endif
}

void DistrhoUI3BandEQ::imageKnobDragStarted(ImageKnob* knob)


+ 2
- 0
source/native-plugins/distrho-3bandeq/DistrhoUI3BandEQ.hpp View File

@@ -66,7 +66,9 @@ protected:

private:
Image fImgBackground;
#ifndef DISTRHO_OS_MAC
ImageAboutWindow fAboutWindow;
#endif

ScopedPointer<ImageButton> fButtonAbout;
ScopedPointer<ImageKnob> fKnobLowMid, fKnobMidHigh;


+ 8
- 2
source/native-plugins/distrho-3bandsplitter/DistrhoUI3BandSplitter.cpp View File

@@ -24,8 +24,10 @@ START_NAMESPACE_DISTRHO
// -----------------------------------------------------------------------

DistrhoUI3BandSplitter::DistrhoUI3BandSplitter()
: UI(),
fAboutWindow(this)
: UI()
#ifndef DISTRHO_OS_MAC
, fAboutWindow(this)
#endif
{
// set UI size
setSize(DistrhoArtwork3BandSplitter::backgroundWidth, DistrhoArtwork3BandSplitter::backgroundHeight);
@@ -33,9 +35,11 @@ DistrhoUI3BandSplitter::DistrhoUI3BandSplitter()
// background
fImgBackground = Image(DistrhoArtwork3BandSplitter::backgroundData, DistrhoArtwork3BandSplitter::backgroundWidth, DistrhoArtwork3BandSplitter::backgroundHeight, GL_BGR);

#ifndef DISTRHO_OS_MAC
// about
Image aboutImage(DistrhoArtwork3BandSplitter::aboutData, DistrhoArtwork3BandSplitter::aboutWidth, DistrhoArtwork3BandSplitter::aboutHeight, GL_BGR);
fAboutWindow.setImage(aboutImage);
#endif

// sliders
Image sliderImage(DistrhoArtwork3BandSplitter::sliderData, DistrhoArtwork3BandSplitter::sliderWidth, DistrhoArtwork3BandSplitter::sliderHeight);
@@ -157,7 +161,9 @@ void DistrhoUI3BandSplitter::imageButtonClicked(ImageButton* button, int)
if (button != fButtonAbout)
return;

#ifndef DISTRHO_OS_MAC
fAboutWindow.exec();
#endif
}

void DistrhoUI3BandSplitter::imageKnobDragStarted(ImageKnob* knob)


+ 2
- 0
source/native-plugins/distrho-3bandsplitter/DistrhoUI3BandSplitter.hpp View File

@@ -66,7 +66,9 @@ protected:

private:
Image fImgBackground;
#ifndef DISTRHO_OS_MAC
ImageAboutWindow fAboutWindow;
#endif

ScopedPointer<ImageButton> fButtonAbout;
ScopedPointer<ImageKnob> fKnobLowMid, fKnobMidHigh;


+ 8
- 2
source/native-plugins/distrho-nekobi/DistrhoUINekobi.cpp View File

@@ -23,8 +23,10 @@ START_NAMESPACE_DISTRHO
// -----------------------------------------------------------------------

DistrhoUINekobi::DistrhoUINekobi()
: UI(),
fAboutWindow(this)
: UI()
#ifndef DISTRHO_OS_MAC
, fAboutWindow(this)
#endif
{
// FIXME
fNeko.setTimerSpeed(5);
@@ -35,8 +37,10 @@ DistrhoUINekobi::DistrhoUINekobi()
// background
fImgBackground = Image(DistrhoArtworkNekobi::backgroundData, DistrhoArtworkNekobi::backgroundWidth, DistrhoArtworkNekobi::backgroundHeight, GL_BGR);

#ifndef DISTRHO_OS_MAC
Image aboutImage(DistrhoArtworkNekobi::aboutData, DistrhoArtworkNekobi::aboutWidth, DistrhoArtworkNekobi::aboutHeight, GL_BGR);
fAboutWindow.setImage(aboutImage);
#endif

// slider
Image sliderImage(DistrhoArtworkNekobi::sliderData, DistrhoArtworkNekobi::sliderWidth, DistrhoArtworkNekobi::sliderHeight);
@@ -182,7 +186,9 @@ void DistrhoUINekobi::imageButtonClicked(ImageButton* button, int)
if (button != fButtonAbout)
return;

#ifndef DISTRHO_OS_MAC
fAboutWindow.exec();
#endif
}

void DistrhoUINekobi::imageKnobDragStarted(ImageKnob* knob)


+ 2
- 0
source/native-plugins/distrho-nekobi/DistrhoUINekobi.hpp View File

@@ -71,7 +71,9 @@ protected:

private:
Image fImgBackground;
#ifndef DISTRHO_OS_MAC
ImageAboutWindow fAboutWindow;
#endif
NekoWidget fNeko;

ScopedPointer<ImageButton> fButtonAbout;


+ 8
- 2
source/native-plugins/distrho-pingpongpan/DistrhoUIPingPongPan.cpp View File

@@ -22,8 +22,10 @@ START_NAMESPACE_DISTRHO
// -----------------------------------------------------------------------

DistrhoUIPingPongPan::DistrhoUIPingPongPan()
: UI(),
fAboutWindow(this)
: UI()
#ifndef DISTRHO_OS_MAC
, fAboutWindow(this)
#endif
{
// set UI size
setSize(DistrhoArtworkPingPongPan::backgroundWidth, DistrhoArtworkPingPongPan::backgroundHeight);
@@ -31,8 +33,10 @@ DistrhoUIPingPongPan::DistrhoUIPingPongPan()
// background
fImgBackground = Image(DistrhoArtworkPingPongPan::backgroundData, DistrhoArtworkPingPongPan::backgroundWidth, DistrhoArtworkPingPongPan::backgroundHeight, GL_BGR);

#ifndef DISTRHO_OS_MAC
Image imageAbout(DistrhoArtworkPingPongPan::aboutData, DistrhoArtworkPingPongPan::aboutWidth, DistrhoArtworkPingPongPan::aboutHeight, GL_BGR);
fAboutWindow.setImage(imageAbout);
#endif

// knobs
Image knobImage(DistrhoArtworkPingPongPan::knobData, DistrhoArtworkPingPongPan::knobWidth, DistrhoArtworkPingPongPan::knobHeight);
@@ -100,7 +104,9 @@ void DistrhoUIPingPongPan::imageButtonClicked(ImageButton* button, int)
if (button != fButtonAbout)
return;

#ifndef DISTRHO_OS_MAC
fAboutWindow.exec();
#endif
}

void DistrhoUIPingPongPan::imageKnobDragStarted(ImageKnob* knob)


+ 2
- 0
source/native-plugins/distrho-pingpongpan/DistrhoUIPingPongPan.hpp View File

@@ -60,7 +60,9 @@ protected:

private:
Image fImgBackground;
#ifndef DISTRHO_OS_MAC
ImageAboutWindow fAboutWindow;
#endif

ScopedPointer<ImageButton> fButtonAbout;
ScopedPointer<ImageKnob> fKnobFreq, fKnobWidth;


+ 8
- 2
source/native-plugins/distrho-vectorjuice/VectorJuiceUI.cpp View File

@@ -25,8 +25,10 @@ START_NAMESPACE_DISTRHO
// -----------------------------------------------------------------------

VectorJuiceUI::VectorJuiceUI()
: UI(),
fAboutWindow(this)
: UI()
#ifndef DISTRHO_OS_MAC
, fAboutWindow(this)
#endif
{
setSize(VectorJuiceArtwork::backgroundWidth, VectorJuiceArtwork::backgroundHeight);

@@ -55,9 +57,11 @@ VectorJuiceUI::VectorJuiceUI()
//subOrbit
fImgSubOrbit = Image(VectorJuiceArtwork::subOrbitData, VectorJuiceArtwork::subOrbitWidth, VectorJuiceArtwork::subOrbitHeight);

#ifndef DISTRHO_OS_MAC
// about
Image aboutImage(VectorJuiceArtwork::aboutData, VectorJuiceArtwork::aboutWidth, VectorJuiceArtwork::aboutHeight, GL_BGR);
fAboutWindow.setImage(aboutImage);
#endif

// about button
Image aboutImageNormal(VectorJuiceArtwork::aboutButtonNormalData, VectorJuiceArtwork::aboutButtonNormalWidth, VectorJuiceArtwork::aboutButtonNormalHeight);
@@ -303,7 +307,9 @@ void VectorJuiceUI::imageButtonClicked(ImageButton* button, int)
if (button != fButtonAbout)
return;

#ifndef DISTRHO_OS_MAC
fAboutWindow.exec();
#endif
}

void VectorJuiceUI::imageKnobDragStarted(ImageKnob* knob)


+ 2
- 0
source/native-plugins/distrho-vectorjuice/VectorJuiceUI.hpp View File

@@ -74,7 +74,9 @@ private:
Image fImgRoundlet;
Image fImgOrbit;
Image fImgSubOrbit;
#ifndef DISTRHO_OS_MAC
ImageAboutWindow fAboutWindow;
#endif

ScopedPointer<ImageButton> fButtonAbout;



+ 8
- 2
source/native-plugins/distrho-wobblejuice/WobbleJuiceUI.cpp View File

@@ -23,17 +23,21 @@ START_NAMESPACE_DISTRHO
// -----------------------------------------------------------------------

WobbleJuiceUI::WobbleJuiceUI()
: UI(),
fAboutWindow(this)
: UI()
#ifndef DISTRHO_OS_MAC
, fAboutWindow(this)
#endif
{
setSize(WobbleJuiceArtwork::backgroundWidth, WobbleJuiceArtwork::backgroundHeight);

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

#ifndef DISTRHO_OS_MAC
// about
Image aboutImage(WobbleJuiceArtwork::aboutData, WobbleJuiceArtwork::aboutWidth, WobbleJuiceArtwork::aboutHeight, GL_BGR);
fAboutWindow.setImage(aboutImage);
#endif

// knobs
Image knobImage(WobbleJuiceArtwork::knobData, WobbleJuiceArtwork::knobWidth, WobbleJuiceArtwork::knobHeight);
@@ -154,7 +158,9 @@ void WobbleJuiceUI::imageButtonClicked(ImageButton* button, int)
if (button != fButtonAbout)
return;

#ifndef DISTRHO_OS_MAC
fAboutWindow.exec();
#endif
}

void WobbleJuiceUI::imageKnobDragStarted(ImageKnob* knob)


+ 2
- 0
source/native-plugins/distrho-wobblejuice/WobbleJuiceUI.hpp View File

@@ -61,7 +61,9 @@ protected:

private:
Image fImgBackground;
#ifndef DISTRHO_OS_MAC
ImageAboutWindow fAboutWindow;
#endif

ScopedPointer<ImageButton> fButtonAbout;
ScopedPointer<ImageKnob> fKnobDivision, fKnobResonance, fKnobRange;


Loading…
Cancel
Save