Browse Source

Fix build without "using namespace"

Signed-off-by: falkTX <falktx@falktx.com>
pull/309/head
falkTX 4 years ago
parent
commit
69744feaf2
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
5 changed files with 17 additions and 7 deletions
  1. +4
    -0
      distrho/extra/LibraryUtils.hpp
  2. +2
    -2
      distrho/src/DistrhoUIInternal.hpp
  3. +5
    -5
      distrho/src/DistrhoUIPrivateData.hpp
  4. +3
    -0
      distrho/src/jackbridge/JackBridge.cpp
  5. +3
    -0
      distrho/src/jackbridge/RtAudioBridge.hpp

+ 4
- 0
distrho/extra/LibraryUtils.hpp View File

@@ -31,6 +31,8 @@ typedef HMODULE lib_t;
typedef void* lib_t;
#endif

START_NAMESPACE_DISTRHO

// -----------------------------------------------------------------------
// library related calls

@@ -129,4 +131,6 @@ const char* lib_error(const char* const filename) noexcept

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

END_NAMESPACE_DISTRHO

#endif // DISTRHO_LIBRARY_UTILS_HPP_INCLUDED

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

@@ -321,7 +321,7 @@ public:
bool handlePluginKeyboard(const bool press, const uint key, const uint16_t mods)
{
// TODO also trigger Character input event
Widget::KeyboardEvent ev;
DGL_NAMESPACE::Widget::KeyboardEvent ev;
ev.press = press;
ev.key = key;
ev.mod = mods;
@@ -330,7 +330,7 @@ public:

bool handlePluginSpecial(const bool press, const DGL_NAMESPACE::Key key, const uint16_t mods)
{
Widget::SpecialEvent ev;
DGL_NAMESPACE::Widget::SpecialEvent ev;
ev.press = press;
ev.key = key;
ev.mod = mods;


+ 5
- 5
distrho/src/DistrhoUIPrivateData.hpp View File

@@ -70,10 +70,10 @@ public:
// TODO external ui stuff
class PluginWindow
{
UI* const ui;
DISTRHO_NAMESPACE::UI* const ui;

public:
explicit PluginWindow(UI* const uiPtr,
explicit PluginWindow(DISTRHO_NAMESPACE::UI* const uiPtr,
PluginApplication& app,
const uintptr_t parentWindowHandle,
const uint width,
@@ -107,10 +107,10 @@ public:
#else
class PluginWindow : public Window
{
UI* const ui;
DISTRHO_NAMESPACE::UI* const ui;

public:
explicit PluginWindow(UI* const uiPtr,
explicit PluginWindow(DISTRHO_NAMESPACE::UI* const uiPtr,
PluginApplication& app,
const uintptr_t parentWindowHandle,
const uint width,
@@ -312,7 +312,7 @@ inline bool UI::PrivateData::fileRequestCallback(const char* const key)
snprintf(title, sizeof(title)-1u, DISTRHO_PLUGIN_NAME ": %s", key);
title[sizeof(title)-1u] = '\0';

Window::FileBrowserOptions opts;
DGL_NAMESPACE::Window::FileBrowserOptions opts;
opts.title = title;
return window->openFileBrowser(opts);
#endif


+ 3
- 0
distrho/src/jackbridge/JackBridge.cpp View File

@@ -424,6 +424,7 @@ struct JackBridge {
# else
const char* const filename("libjack.so.0");
# endif
USE_NAMESPACE_DISTRHO

lib = lib_open(filename);

@@ -563,6 +564,8 @@ struct JackBridge {

~JackBridge() noexcept
{
USE_NAMESPACE_DISTRHO

if (lib != nullptr)
{
lib_close(lib);


+ 3
- 0
distrho/src/jackbridge/RtAudioBridge.hpp View File

@@ -40,6 +40,9 @@
# include "../../extra/RingBuffer.hpp"
# include "../../extra/ScopedPointer.hpp"

using DISTRHO_NAMESPACE::HeapRingBuffer;
using DISTRHO_NAMESPACE::ScopedPointer;

struct RtAudioBridge {
// pointer to RtAudio instance
ScopedPointer<RtAudio> handle;


Loading…
Cancel
Save