Browse Source

Fix build

tags/1.9.4
falkTX 11 years ago
parent
commit
645543b19e
5 changed files with 7 additions and 5 deletions
  1. +1
    -1
      source/backend/engine/CarlaEngineThread.cpp
  2. +1
    -1
      source/backend/plugin/CarlaPlugin.cpp
  3. +2
    -0
      source/backend/plugin/NativePlugin.cpp
  4. +1
    -1
      source/libs/distrho/dgl/src/ImageAboutWindow.cpp
  5. +2
    -2
      source/libs/distrho/dgl/src/ImageKnob.cpp

+ 1
- 1
source/backend/engine/CarlaEngineThread.cpp View File

@@ -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


+ 1
- 1
source/backend/plugin/CarlaPlugin.cpp View File

@@ -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();


+ 2
- 0
source/backend/plugin/NativePlugin.cpp View File

@@ -19,6 +19,8 @@

#ifdef WANT_NATIVE

#include "CarlaNative.h"

#include <QtGui/QFileDialog>

CARLA_BACKEND_START_NAMESPACE


+ 1
- 1
source/libs/distrho/dgl/src/ImageAboutWindow.cpp View File

@@ -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;


+ 2
- 2
source/libs/distrho/dgl/src/ImageKnob.cpp View File

@@ -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)


Loading…
Cancel
Save