From 645543b19e788e62ab656c3cc323c601b6ca336e Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 27 Feb 2013 13:14:09 +0000 Subject: [PATCH] Fix build --- source/backend/engine/CarlaEngineThread.cpp | 2 +- source/backend/plugin/CarlaPlugin.cpp | 2 +- source/backend/plugin/NativePlugin.cpp | 2 ++ source/libs/distrho/dgl/src/ImageAboutWindow.cpp | 2 +- source/libs/distrho/dgl/src/ImageKnob.cpp | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/backend/engine/CarlaEngineThread.cpp b/source/backend/engine/CarlaEngineThread.cpp index 6e414a490..5b679ec23 100644 --- a/source/backend/engine/CarlaEngineThread.cpp +++ b/source/backend/engine/CarlaEngineThread.cpp @@ -94,7 +94,7 @@ void CarlaEngineThread::run() CARLA_SAFE_ASSERT_INT2(i == plugin->id(), i, plugin->id()); - usesSingleThread = (plugin->hints() & PLUGIN_USES_SINGLE_THREAD); + usesSingleThread = (plugin->hints() & PLUGIN_HAS_SINGLE_THREAD); // ------------------------------------------------------- // Process postponed events diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp index 43b1ce958..b1a4d44c8 100644 --- a/source/backend/plugin/CarlaPlugin.cpp +++ b/source/backend/plugin/CarlaPlugin.cpp @@ -879,7 +879,7 @@ void CarlaPlugin::idleGui() if (! fEnabled) return; - if (fHints & PLUGIN_USES_SINGLE_THREAD) + if (fHints & PLUGIN_HAS_SINGLE_THREAD) { // Process postponed events postRtEventsRun(); diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp index fc2b81e3c..f84aba07a 100644 --- a/source/backend/plugin/NativePlugin.cpp +++ b/source/backend/plugin/NativePlugin.cpp @@ -19,6 +19,8 @@ #ifdef WANT_NATIVE +#include "CarlaNative.h" + #include CARLA_BACKEND_START_NAMESPACE diff --git a/source/libs/distrho/dgl/src/ImageAboutWindow.cpp b/source/libs/distrho/dgl/src/ImageAboutWindow.cpp index 9786edb4a..15b9a05cc 100644 --- a/source/libs/distrho/dgl/src/ImageAboutWindow.cpp +++ b/source/libs/distrho/dgl/src/ImageAboutWindow.cpp @@ -53,7 +53,7 @@ bool ImageAboutWindow::onMouse(int, bool press, int, int) bool ImageAboutWindow::onKeyboard(bool press, uint32_t key) { - if (press && key == CHAR_ESCAPE) + if (press && key == DGL_CHAR_ESCAPE) { Window::hide(); return true; diff --git a/source/libs/distrho/dgl/src/ImageKnob.cpp b/source/libs/distrho/dgl/src/ImageKnob.cpp index 3d6295d59..eec171279 100644 --- a/source/libs/distrho/dgl/src/ImageKnob.cpp +++ b/source/libs/distrho/dgl/src/ImageKnob.cpp @@ -166,7 +166,7 @@ bool ImageKnob::onMotion(int x, int y) if (movX != 0) { - float d = (getModifiers() & MODIFIER_SHIFT) ? 2000.0f : 200.0f; + float d = (getModifiers() & DGL_MODIFIER_SHIFT) ? 2000.0f : 200.0f; float value = fValue + (float(fMaximum - fMinimum) / d * float(movX)); if (value < fMinimum) @@ -183,7 +183,7 @@ bool ImageKnob::onMotion(int x, int y) if (movY != 0) { - float d = (getModifiers() & MODIFIER_SHIFT) ? 2000.0f : 200.0f; + float d = (getModifiers() & DGL_MODIFIER_SHIFT) ? 2000.0f : 200.0f; float value = fValue + (float(fMaximum - fMinimum) / d * float(movY)); if (value < fMinimum)