Browse Source

Carla: More plugin-bridge fixes

tags/v0.9.0
falkTX 13 years ago
parent
commit
919a24cec6
3 changed files with 4 additions and 3 deletions
  1. +2
    -0
      c++/carla-backend/carla_plugin.h
  2. +0
    -1
      c++/carla-bridge/carla_bridge_plugin.cpp
  3. +2
    -2
      src/carla_backend.py

+ 2
- 0
c++/carla-backend/carla_plugin.h View File

@@ -1472,6 +1472,7 @@ public:
} }


// Programs // Programs
if (prog.count > 0)
{ {
#ifdef BUILD_BRIDGE #ifdef BUILD_BRIDGE
x_engine->osc_send_bridge_program_count(prog.count); x_engine->osc_send_bridge_program_count(prog.count);
@@ -1491,6 +1492,7 @@ public:
} }


// MIDI Programs // MIDI Programs
if (midiprog.count > 0)
{ {
#ifdef BUILD_BRIDGE #ifdef BUILD_BRIDGE
x_engine->osc_send_bridge_midi_program_count(midiprog.count); x_engine->osc_send_bridge_midi_program_count(midiprog.count);


+ 0
- 1
c++/carla-bridge/carla_bridge_plugin.cpp View File

@@ -291,7 +291,6 @@ public:
void handleCallback(const CarlaBackend::CallbackType action, const int value1, const int value2, const double value3) void handleCallback(const CarlaBackend::CallbackType action, const int value1, const int value2, const double value3)
{ {
qDebug("CarlaPluginClient::handleCallback(%s, %i, %i, %g)", CarlaBackend::CallbackType2str(action), value1, value2, value3); qDebug("CarlaPluginClient::handleCallback(%s, %i, %i, %g)", CarlaBackend::CallbackType2str(action), value1, value2, value3);
Q_ASSERT(engine);


if (! engine) if (! engine)
return; return;


+ 2
- 2
src/carla_backend.py View File

@@ -323,7 +323,7 @@ if os.path.exists(os.path.join(CWDpp, "carla-discovery", "carla-discovery-win32.
carla_discovery_win32 = os.path.join(CWDpp, "carla-discovery", "carla-discovery-win32.exe") carla_discovery_win32 = os.path.join(CWDpp, "carla-discovery", "carla-discovery-win32.exe")
else: else:
for p in PATH: for p in PATH:
if os.path.exists(os.path.join(p, "carla-discovery-wine32.exe")):
if os.path.exists(os.path.join(p, "carla-discovery-win32.exe")):
carla_discovery_win32 = os.path.join(p, "carla-discovery-win32.exe") carla_discovery_win32 = os.path.join(p, "carla-discovery-win32.exe")
break break


@@ -359,7 +359,7 @@ if os.path.exists(os.path.join(CWDpp, "carla-bridge", "carla-bridge-win32.exe"))
carla_bridge_win32 = os.path.join(CWDpp, "carla-bridge", "carla-bridge-win32.exe") carla_bridge_win32 = os.path.join(CWDpp, "carla-bridge", "carla-bridge-win32.exe")
else: else:
for p in PATH: for p in PATH:
if os.path.exists(os.path.join(p, "carla-bridge-wine32.exe")):
if os.path.exists(os.path.join(p, "carla-bridge-win32.exe")):
carla_bridge_win32 = os.path.join(p, "carla-bridge-win32.exe") carla_bridge_win32 = os.path.join(p, "carla-bridge-win32.exe")
break break




Loading…
Cancel
Save