Browse Source

Fix build without set-DGL-namespace

pull/182/head
falkTX 3 years ago
parent
commit
335cb08628
9 changed files with 54 additions and 1 deletions
  1. +2
    -0
      distrho/src/DistrhoPluginVST.cpp
  2. +1
    -1
      distrho/src/DistrhoUIInternal.hpp
  3. +8
    -0
      examples/CairoUI/DemoWidgetBanner.cpp
  4. +10
    -0
      examples/CairoUI/DemoWidgetBanner.hpp
  5. +8
    -0
      examples/CairoUI/DemoWidgetClickable.cpp
  6. +10
    -0
      examples/CairoUI/DemoWidgetClickable.hpp
  7. +5
    -0
      examples/Meters/ExampleUIMeters.cpp
  8. +5
    -0
      examples/Parameters/ExampleUIParameters.cpp
  9. +5
    -0
      examples/States/ExampleUIStates.cpp

+ 2
- 0
distrho/src/DistrhoPluginVST.cpp View File

@@ -231,6 +231,8 @@ public:

d_stdout("handlePluginKeyEvent %i %i %li\n", down, index, (long int)value);

using namespace DGL_NAMESPACE;

int special = 0;
switch (value)
{


+ 1
- 1
distrho/src/DistrhoUIInternal.hpp View File

@@ -528,7 +528,7 @@ public:
return glWindow.handlePluginKeyboard(press, key);
}

bool handlePluginSpecial(const bool press, const Key key)
bool handlePluginSpecial(const bool press, const DGL_NAMESPACE::Key key)
{
return glWindow.handlePluginSpecial(press, key);
}


+ 8
- 0
examples/CairoUI/DemoWidgetBanner.cpp View File

@@ -19,6 +19,10 @@
#include "Cairo.hpp"
#include "Window.hpp"

START_NAMESPACE_DGL

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

static const char* banner =
" "
" * * * * * "
@@ -90,3 +94,7 @@ void DemoWidgetBanner::onDisplay()
}
}
}

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

END_NAMESPACE_DGL

+ 10
- 0
examples/CairoUI/DemoWidgetBanner.hpp View File

@@ -16,9 +16,19 @@

#include "Widget.hpp"

START_NAMESPACE_DGL

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

class DemoWidgetBanner : public Widget
{
public:
explicit DemoWidgetBanner(Widget* group);
void onDisplay() override;
};

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

END_NAMESPACE_DGL

using DGL_NAMESPACE::DemoWidgetBanner;

+ 8
- 0
examples/CairoUI/DemoWidgetClickable.cpp View File

@@ -19,6 +19,10 @@
#include "Cairo.hpp"
#include "Window.hpp"

START_NAMESPACE_DGL

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

DemoWidgetClickable::DemoWidgetClickable(Widget* group)
: Widget(group)
{
@@ -77,3 +81,7 @@ bool DemoWidgetClickable::onMouse(const MouseEvent& event)

return Widget::onMouse(event);
}

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

END_NAMESPACE_DGL

+ 10
- 0
examples/CairoUI/DemoWidgetClickable.hpp View File

@@ -16,6 +16,10 @@

#include "Widget.hpp"

START_NAMESPACE_DGL

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

class DemoWidgetClickable : public Widget
{
public:
@@ -26,3 +30,9 @@ public:
private:
unsigned fColorId = 0;
};

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

END_NAMESPACE_DGL

using DGL_NAMESPACE::DemoWidgetClickable;

+ 5
- 0
examples/Meters/ExampleUIMeters.cpp View File

@@ -18,6 +18,11 @@

START_NAMESPACE_DISTRHO

/**
We need the Color class from DGL.
*/
using DGL_NAMESPACE::Color;

/**
Smooth meters a bit.
*/


+ 5
- 0
examples/Parameters/ExampleUIParameters.cpp View File

@@ -18,6 +18,11 @@

START_NAMESPACE_DISTRHO

/**
We need the rectangle class from DGL.
*/
using DGL_NAMESPACE::Rectangle;

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

class ExampleUIParameters : public UI


+ 5
- 0
examples/States/ExampleUIStates.cpp View File

@@ -18,6 +18,11 @@

START_NAMESPACE_DISTRHO

/**
We need the rectangle class from DGL.
*/
using DGL_NAMESPACE::Rectangle;

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

class ExampleUIParameters : public UI


Loading…
Cancel
Save