Browse Source

Carla/Control: Force TCP protocol for OSC

tags/v0.9.0
falkTX 13 years ago
parent
commit
b707d9409c
3 changed files with 7 additions and 6 deletions
  1. +2
    -2
      c++/carla-backend/carla_engine.cpp
  2. +3
    -3
      c++/carla-backend/carla_osc.cpp
  3. +2
    -1
      src/carla_control.py

+ 2
- 2
c++/carla-backend/carla_engine.cpp View File

@@ -1404,7 +1404,7 @@ void CarlaEngine::osc_send_control_set_program_count(const int32_t pluginId, con

void CarlaEngine::osc_send_control_set_program_name(const int32_t pluginId, const int32_t index, const char* const name)
{
qDebug("CarlaEngine::osc_send_control_set_program_name(%i, %i, %s)", pluginId, index, name);
qDebug("CarlaEngine::osc_send_control_set_program_name(%i, %i, \"%s\")", pluginId, index, name);
Q_ASSERT(m_oscData);
Q_ASSERT(pluginId >= 0 && pluginId < m_maxPluginNumber);
Q_ASSERT(index >= 0);
@@ -1452,7 +1452,7 @@ void CarlaEngine::osc_send_control_set_midi_program_count(const int32_t pluginId

void CarlaEngine::osc_send_control_set_midi_program_data(const int32_t pluginId, const int32_t index, const int32_t bank, const int32_t program, const char* const name)
{
qDebug("CarlaEngine::osc_send_control_set_midi_program_data(%i, %i, %i, %i, %s)", pluginId, index, bank, program, name);
qDebug("CarlaEngine::osc_send_control_set_midi_program_data(%i, %i, %i, %i, \"%s\")", pluginId, index, bank, program, name);
Q_ASSERT(m_oscData);
Q_ASSERT(pluginId >= 0 && pluginId < m_maxPluginNumber);
Q_ASSERT(index >= 0);


+ 3
- 3
c++/carla-backend/carla_osc.cpp View File

@@ -56,7 +56,7 @@ void CarlaOsc::init(const char* const name)
m_name_len = strlen(name);

// create new OSC thread
m_serverThread = lo_server_thread_new(nullptr, osc_error_handler);
m_serverThread = lo_server_thread_new_with_proto(nullptr, LO_TCP, osc_error_handler);

// get our full OSC server path
char* const threadPath = lo_server_thread_get_url(m_serverThread);
@@ -272,12 +272,12 @@ int CarlaOsc::handleMsgRegister(const int argc, const lo_arg* const* const argv,

host = lo_address_get_hostname(source);
port = lo_address_get_port(source);
m_controllerData.source = lo_address_new(host, port);
m_controllerData.source = lo_address_new_with_proto(LO_TCP, host, port);

host = lo_url_get_hostname(url);
port = lo_url_get_port(url);
m_controllerData.path = lo_url_get_path(url);
m_controllerData.target = lo_address_new(host, port);
m_controllerData.target = lo_address_new_with_proto(LO_TCP, host, port);

free((void*)host);
free((void*)port);


+ 2
- 1
src/carla_control.py View File

@@ -20,6 +20,7 @@
from PyQt4.QtGui import QApplication, QMainWindow
from liblo import make_method, Address, ServerError, ServerThread
from liblo import send as lo_send
from liblo import TCP as LO_TCP

# Imports (Custom)
import ui_carla_about, ui_carla_control
@@ -384,7 +385,7 @@ class Host(object):
# OSC Control server
class ControlServer(ServerThread):
def __init__(self, parent):
ServerThread.__init__(self, 8087)
ServerThread.__init__(self, 8087, LO_TCP)

self.parent = parent



Loading…
Cancel
Save