falkTX
/
Cadence
mirror of https://github.com/falkTX/Cadence
1
0
Fork 0
Code Releases 3 Activity
Browse Source

Carla: Code cosmetic changes, fix last commit

tags/v0.9.0
falkTX 13 years ago
parent
d522786587
commit
6a167c4e78
6 changed files with 105 additions and 104 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      c++/carla-backend/Makefile
  2. +1
    -1
      c++/carla-backend/Makefile.dbg
  3. +71
    -71
      c++/carla-backend/carla_osc.cpp
  4. +26
    -26
      c++/carla-backend/carla_osc.h
  5. +4
    -4
      c++/carla-backend/lv2.cpp
  6. +2
    -1
      c++/carla-backend/qtcreator/carla-backend.pro

+ 1
- 1
c++/carla-backend/Makefile View File

@@ -22,7 +22,7 @@ CARLA_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
CARLA_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtGui) CARLA_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtGui)
CARLA_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT -DNDEBUG CARLA_CXX_FLAGS += -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT -DNDEBUG


CARLA_CXX_FLAGS += WANT_LADSPA WANT_DSSI WANT_LV2 WANT_VST
CARLA_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
CARLA_CXX_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header CARLA_CXX_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header


CARLA_LD_FLAGS = -shared -ldl -lm -fPIC $(LDFLAGS) CARLA_LD_FLAGS = -shared -ldl -lm -fPIC $(LDFLAGS)


+ 1
- 1
c++/carla-backend/Makefile.dbg View File

@@ -22,7 +22,7 @@ CARLA_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
CARLA_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtGui) CARLA_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtGui)
CARLA_CXX_FLAGS += -DDEBUG CARLA_CXX_FLAGS += -DDEBUG


CARLA_CXX_FLAGS += WANT_LADSPA WANT_DSSI WANT_LV2 WANT_VST
CARLA_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
CARLA_CXX_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header CARLA_CXX_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header


CARLA_LD_FLAGS = -shared -ldl -lm -fPIC $(LDFLAGS) CARLA_LD_FLAGS = -shared -ldl -lm -fPIC $(LDFLAGS)


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

@@ -103,11 +103,11 @@ int CarlaOsc::handleMessage(const char* const path, const int argc, const lo_arg
if (strcmp(path, "/register") == 0) if (strcmp(path, "/register") == 0)
{ {
const lo_address source = lo_message_get_source(msg); const lo_address source = lo_message_get_source(msg);
return handle_register(argc, argv, types, source);
return handleMsgRegister(argc, argv, types, source);
} }
if (strcmp(path, "/unregister") == 0) if (strcmp(path, "/unregister") == 0)
{ {
return handle_unregister();
return handleMsgUnregister();
} }


// Check if message is for this client // Check if message is for this client
@@ -150,60 +150,60 @@ int CarlaOsc::handleMessage(const char* const path, const int argc, const lo_arg
if (strcmp(method, "/update") == 0) if (strcmp(method, "/update") == 0)
{ {
const lo_address source = lo_message_get_source(msg); const lo_address source = lo_message_get_source(msg);
return handle_update(plugin, argc, argv, types, source);
return handleMsgUpdate(plugin, argc, argv, types, source);
} }
if (strcmp(method, "/configure") == 0) if (strcmp(method, "/configure") == 0)
return handle_configure(plugin, argc, argv, types);
return handleMsgConfigure(plugin, argc, argv, types);
if (strcmp(method, "/control") == 0) if (strcmp(method, "/control") == 0)
return handle_control(plugin, argc, argv, types);
return handleMsgControl(plugin, argc, argv, types);
if (strcmp(method, "/program") == 0) if (strcmp(method, "/program") == 0)
return handle_program(plugin, argc, argv, types);
return handleMsgProgram(plugin, argc, argv, types);
if (strcmp(method, "/midi") == 0) if (strcmp(method, "/midi") == 0)
return handle_midi(plugin, argc, argv, types);
return handleMsgMidi(plugin, argc, argv, types);
if (strcmp(method, "/exiting") == 0) if (strcmp(method, "/exiting") == 0)
return handle_exiting(plugin);
return handleMsgExiting(plugin);


// Internal methods // Internal methods
if (strcmp(method, "/set_active") == 0) if (strcmp(method, "/set_active") == 0)
return handle_set_active(plugin, argc, argv, types);
return handleMsgSetActive(plugin, argc, argv, types);
if (strcmp(method, "/set_drywet") == 0) if (strcmp(method, "/set_drywet") == 0)
return handle_set_drywet(plugin, argc, argv, types);
return handleMsgSetDryWet(plugin, argc, argv, types);
if (strcmp(method, "/set_volume") == 0) if (strcmp(method, "/set_volume") == 0)
return handle_set_volume(plugin, argc, argv, types);
return handleMsgSetVolume(plugin, argc, argv, types);
if (strcmp(method, "/set_balance_left") == 0) if (strcmp(method, "/set_balance_left") == 0)
return handle_set_balance_left(plugin, argc, argv, types);
return handleMsgSetBalanceLeft(plugin, argc, argv, types);
if (strcmp(method, "/set_balance_right") == 0) if (strcmp(method, "/set_balance_right") == 0)
return handle_set_balance_right(plugin, argc, argv, types);
return handleMsgSetBalanceRight(plugin, argc, argv, types);
if (strcmp(method, "/set_parameter_value") == 0) if (strcmp(method, "/set_parameter_value") == 0)
return handle_set_parameter_value(plugin, argc, argv, types);
return handleMsgSetParameterValue(plugin, argc, argv, types);
if (strcmp(method, "/set_parameter_midi_cc") == 0) if (strcmp(method, "/set_parameter_midi_cc") == 0)
return handle_set_parameter_midi_cc(plugin, argc, argv, types);
return handleMsgSetParameterMidiCC(plugin, argc, argv, types);
if (strcmp(method, "/set_parameter_midi_channel") == 0) if (strcmp(method, "/set_parameter_midi_channel") == 0)
return handle_set_parameter_midi_channel(plugin, argc, argv, types);
return handleMsgSetParameterMidiChannel(plugin, argc, argv, types);
if (strcmp(method, "/set_program") == 0) if (strcmp(method, "/set_program") == 0)
return handle_set_program(plugin, argc, argv, types);
return handleMsgSetProgram(plugin, argc, argv, types);
if (strcmp(method, "/set_midi_program") == 0) if (strcmp(method, "/set_midi_program") == 0)
return handle_set_midi_program(plugin, argc, argv, types);
return handleMsgSetMidiProgram(plugin, argc, argv, types);
if (strcmp(method, "/note_on") == 0) if (strcmp(method, "/note_on") == 0)
return handle_note_on(plugin, argc, argv, types);
return handleMsgNoteOn(plugin, argc, argv, types);
if (strcmp(method, "/note_off") == 0) if (strcmp(method, "/note_off") == 0)
return handle_note_off(plugin, argc, argv, types);
return handleMsgNoteOff(plugin, argc, argv, types);


// Plugin-specific methods // Plugin-specific methods
#ifdef WANT_LV2 #ifdef WANT_LV2
if (strcmp(method, "/lv2_atom_transfer") == 0) if (strcmp(method, "/lv2_atom_transfer") == 0)
return handle_lv2_atom_transfer(plugin, argc, argv, types);
return handleMsgLv2AtomTransfer(plugin, argc, argv, types);
if (strcmp(method, "/lv2_event_transfer") == 0) if (strcmp(method, "/lv2_event_transfer") == 0)
return handle_lv2_event_transfer(plugin, argc, argv, types);
return handleMsgLv2EventTransfer(plugin, argc, argv, types);
#endif #endif


// Plugin Bridges // Plugin Bridges
if (plugin->hints() & PLUGIN_IS_BRIDGE) if (plugin->hints() & PLUGIN_IS_BRIDGE)
{ {
if (strcmp(method, "/bridge_set_input_peak_value") == 0) if (strcmp(method, "/bridge_set_input_peak_value") == 0)
return handle_bridge_set_input_peak_value(plugin, argc, argv, types);
return handleMsgBridgeSetInputPeakValue(plugin, argc, argv, types);
if (strcmp(method, "/bridge_set_output_peak_value") == 0) if (strcmp(method, "/bridge_set_output_peak_value") == 0)
return handle_bridge_set_output_peak_value(plugin, argc, argv, types);
return handleMsgBridgeSetOutputPeakValue(plugin, argc, argv, types);
if (strcmp(method, "/bridge_audio_count") == 0) if (strcmp(method, "/bridge_audio_count") == 0)
return plugin->setOscBridgeInfo(PluginBridgeAudioCount, argc, argv, types); return plugin->setOscBridgeInfo(PluginBridgeAudioCount, argc, argv, types);
if (strcmp(method, "/bridge_midi_count") == 0) if (strcmp(method, "/bridge_midi_count") == 0)
@@ -250,14 +250,14 @@ int CarlaOsc::handleMessage(const char* const path, const int argc, const lo_arg


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


int CarlaOsc::handle_register(const int argc, const lo_arg* const* const argv, const char* const types, const lo_address source)
int CarlaOsc::handleMsgRegister(const int argc, const lo_arg* const* const argv, const char* const types, const lo_address source)
{ {
qDebug("CarlaOsc::handle_register()");
qDebug("CarlaOsc::handleMsgRegister()");
CARLA_OSC_CHECK_OSC_TYPES(1, "s"); CARLA_OSC_CHECK_OSC_TYPES(1, "s");


if (m_controllerData.path) if (m_controllerData.path)
{ {
qWarning("CarlaOsc::handle_register() - OSC backend already registered to %s", m_controllerData.path);
qWarning("CarlaOsc::handleMsgRegister() - OSC backend already registered to %s", m_controllerData.path);
return 1; return 1;
} }


@@ -265,7 +265,7 @@ int CarlaOsc::handle_register(const int argc, const lo_arg* const* const argv, c
const char* host; const char* host;
const char* port; const char* port;


qDebug("CarlaOsc::handle_register() - OSC backend registered to %s", url);
qDebug("CarlaOsc::handleMsgRegister() - OSC backend registered to %s", url);


host = lo_address_get_hostname(source); host = lo_address_get_hostname(source);
port = lo_address_get_port(source); port = lo_address_get_port(source);
@@ -291,13 +291,13 @@ int CarlaOsc::handle_register(const int argc, const lo_arg* const* const argv, c
return 0; return 0;
} }


int CarlaOsc::handle_unregister()
int CarlaOsc::handleMsgUnregister()
{ {
qDebug("CarlaOsc::handle_unregister()");
qDebug("CarlaOsc::handleMsgUnregister()");


if (! m_controllerData.path) if (! m_controllerData.path)
{ {
qWarning("CarlaOsc::handle_unregister() - OSC backend is not registered yet");
qWarning("CarlaOsc::handleMsgUnregister() - OSC backend is not registered yet");
return 1; return 1;
} }


@@ -307,9 +307,9 @@ int CarlaOsc::handle_unregister()


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


int CarlaOsc::handle_update(CARLA_OSC_HANDLE_ARGS2, const lo_address source)
int CarlaOsc::handleMsgUpdate(CARLA_OSC_HANDLE_ARGS2, const lo_address source)
{ {
qDebug("CarlaOsc::handle_update()");
qDebug("CarlaOsc::handleMsgUpdate()");
CARLA_OSC_CHECK_OSC_TYPES(1, "s"); CARLA_OSC_CHECK_OSC_TYPES(1, "s");


const char* const url = (const char*)&argv[0]->s; const char* const url = (const char*)&argv[0]->s;
@@ -318,9 +318,9 @@ int CarlaOsc::handle_update(CARLA_OSC_HANDLE_ARGS2, const lo_address source)
return 0; return 0;
} }


int CarlaOsc::handle_configure(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgConfigure(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_configure()");
qDebug("CarlaOsc::handleMsgConfigure()");
CARLA_OSC_CHECK_OSC_TYPES(2, "ss"); CARLA_OSC_CHECK_OSC_TYPES(2, "ss");


const char* const key = (const char*)&argv[0]->s; const char* const key = (const char*)&argv[0]->s;
@@ -331,9 +331,9 @@ int CarlaOsc::handle_configure(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_control(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgControl(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_control()");
qDebug("CarlaOsc::handleMsgControl()");
CARLA_OSC_CHECK_OSC_TYPES(2, "if"); CARLA_OSC_CHECK_OSC_TYPES(2, "if");


const int rindex = argv[0]->i; const int rindex = argv[0]->i;
@@ -343,9 +343,9 @@ int CarlaOsc::handle_control(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_program(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgProgram(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_program()");
qDebug("CarlaOsc::handleMsgProgram()");


if (argc == 2) if (argc == 2)
{ {
@@ -369,15 +369,15 @@ int CarlaOsc::handle_program(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


qCritical("CarlaOsc::handle_program() - program_id '%i' out of bounds", program_id);
qCritical("CarlaOsc::handleMsgProgram() - program_id '%i' out of bounds", program_id);
} }


return 1; return 1;
} }


int CarlaOsc::handle_midi(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgMidi(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_midi()");
qDebug("CarlaOsc::handleMsgMidi()");
CARLA_OSC_CHECK_OSC_TYPES(1, "m"); CARLA_OSC_CHECK_OSC_TYPES(1, "m");


if (plugin->midiInCount() > 0) if (plugin->midiInCount() > 0)
@@ -405,13 +405,13 @@ int CarlaOsc::handle_midi(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


qWarning("CarlaOsc::handle_midi() - recived midi when plugin has no midi inputs");
qWarning("CarlaOsc::handleMsgMidi() - recived midi when plugin has no midi inputs");
return 1; return 1;
} }


int CarlaOsc::handle_exiting(CARLA_OSC_HANDLE_ARGS1)
int CarlaOsc::handleMsgExiting(CARLA_OSC_HANDLE_ARGS1)
{ {
qDebug("CarlaOsc::handle_exiting()");
qDebug("CarlaOsc::handleMsgExiting()");


// TODO - check for non-UIs (dssi-vst) and set to -1 instead // TODO - check for non-UIs (dssi-vst) and set to -1 instead
engine->callback(CALLBACK_SHOW_GUI, plugin->id(), 0, 0, 0.0); engine->callback(CALLBACK_SHOW_GUI, plugin->id(), 0, 0, 0.0);
@@ -422,9 +422,9 @@ int CarlaOsc::handle_exiting(CARLA_OSC_HANDLE_ARGS1)


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


int CarlaOsc::handle_set_active(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetActive(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_active()");
qDebug("CarlaOsc::handleMsgSetActive()");
CARLA_OSC_CHECK_OSC_TYPES(1, "i"); CARLA_OSC_CHECK_OSC_TYPES(1, "i");


const bool active = (bool)argv[0]->i; const bool active = (bool)argv[0]->i;
@@ -433,9 +433,9 @@ int CarlaOsc::handle_set_active(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_set_drywet(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetDryWet(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_drywet()");
qDebug("CarlaOsc::handleMsgSetDryWet()");
CARLA_OSC_CHECK_OSC_TYPES(1, "d"); CARLA_OSC_CHECK_OSC_TYPES(1, "d");


const double value = argv[0]->d; const double value = argv[0]->d;
@@ -444,9 +444,9 @@ int CarlaOsc::handle_set_drywet(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_set_volume(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetVolume(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_volume()");
qDebug("CarlaOsc::handleMsgSetVolume()");
CARLA_OSC_CHECK_OSC_TYPES(1, "d"); CARLA_OSC_CHECK_OSC_TYPES(1, "d");


const double value = argv[0]->d; const double value = argv[0]->d;
@@ -455,9 +455,9 @@ int CarlaOsc::handle_set_volume(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_set_balance_left(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetBalanceLeft(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_balance_left()");
qDebug("CarlaOsc::handleMsgSetBalanceLeft()");
CARLA_OSC_CHECK_OSC_TYPES(1, "d"); CARLA_OSC_CHECK_OSC_TYPES(1, "d");


const double value = argv[0]->d; const double value = argv[0]->d;
@@ -466,9 +466,9 @@ int CarlaOsc::handle_set_balance_left(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_set_balance_right(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetBalanceRight(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_balance_right()");
qDebug("CarlaOsc::handleMsgSetBalanceRight()");
CARLA_OSC_CHECK_OSC_TYPES(1, "d"); CARLA_OSC_CHECK_OSC_TYPES(1, "d");


const double value = argv[0]->d; const double value = argv[0]->d;
@@ -477,9 +477,9 @@ int CarlaOsc::handle_set_balance_right(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_set_parameter_value(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetParameterValue(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_parameter_value()");
qDebug("CarlaOsc::handleMsgSetParameterValue()");
CARLA_OSC_CHECK_OSC_TYPES(2, "id"); CARLA_OSC_CHECK_OSC_TYPES(2, "id");


const int32_t index = argv[0]->i; const int32_t index = argv[0]->i;
@@ -489,9 +489,9 @@ int CarlaOsc::handle_set_parameter_value(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_set_parameter_midi_cc(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetParameterMidiCC(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_parameter_midi_cc()");
qDebug("CarlaOsc::handleMsgSetParameterMidiCC()");
CARLA_OSC_CHECK_OSC_TYPES(2, "ii"); CARLA_OSC_CHECK_OSC_TYPES(2, "ii");


const int32_t index = argv[0]->i; const int32_t index = argv[0]->i;
@@ -501,9 +501,9 @@ int CarlaOsc::handle_set_parameter_midi_cc(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_set_parameter_midi_channel(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetParameterMidiChannel(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_parameter_midi_channel()");
qDebug("CarlaOsc::handleMsgSetParameterMidiChannel()");
CARLA_OSC_CHECK_OSC_TYPES(2, "ii"); CARLA_OSC_CHECK_OSC_TYPES(2, "ii");


const int32_t index = argv[0]->i; const int32_t index = argv[0]->i;
@@ -513,9 +513,9 @@ int CarlaOsc::handle_set_parameter_midi_channel(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_set_program(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetProgram(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_program()");
qDebug("CarlaOsc::handleMsgSetProgram()");
CARLA_OSC_CHECK_OSC_TYPES(1, "i"); CARLA_OSC_CHECK_OSC_TYPES(1, "i");


const int32_t index = argv[0]->i; const int32_t index = argv[0]->i;
@@ -524,9 +524,9 @@ int CarlaOsc::handle_set_program(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_set_midi_program(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgSetMidiProgram(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_set_midi_program()");
qDebug("CarlaOsc::handleMsgSetMidiProgram()");
CARLA_OSC_CHECK_OSC_TYPES(1, "i"); CARLA_OSC_CHECK_OSC_TYPES(1, "i");


const int32_t index = argv[0]->i; const int32_t index = argv[0]->i;
@@ -535,9 +535,9 @@ int CarlaOsc::handle_set_midi_program(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_note_on(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgNoteOn(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_note_on()");
qDebug("CarlaOsc::handleMsgNoteOn()");
CARLA_OSC_CHECK_OSC_TYPES(3, "iii"); CARLA_OSC_CHECK_OSC_TYPES(3, "iii");


const int32_t channel = argv[0]->i; const int32_t channel = argv[0]->i;
@@ -548,9 +548,9 @@ int CarlaOsc::handle_note_on(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_note_off(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgNoteOff(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_note_off()");
qDebug("CarlaOsc::handleMsgNoteOff()");
CARLA_OSC_CHECK_OSC_TYPES(2, "ii"); CARLA_OSC_CHECK_OSC_TYPES(2, "ii");


const int32_t channel = argv[0]->i; const int32_t channel = argv[0]->i;
@@ -560,7 +560,7 @@ int CarlaOsc::handle_note_off(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_bridge_set_input_peak_value(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgBridgeSetInputPeakValue(CARLA_OSC_HANDLE_ARGS2)
{ {
CARLA_OSC_CHECK_OSC_TYPES(2, "id"); CARLA_OSC_CHECK_OSC_TYPES(2, "id");


@@ -571,7 +571,7 @@ int CarlaOsc::handle_bridge_set_input_peak_value(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_bridge_set_output_peak_value(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgBridgeSetOutputPeakValue(CARLA_OSC_HANDLE_ARGS2)
{ {
CARLA_OSC_CHECK_OSC_TYPES(2, "id"); CARLA_OSC_CHECK_OSC_TYPES(2, "id");




+ 26
- 26
c++/carla-backend/carla_osc.h View File

@@ -95,36 +95,36 @@ private:


int handleMessage(const char* const path, const int argc, const lo_arg* const* const argv, const char* const types, const lo_message msg); int handleMessage(const char* const path, const int argc, const lo_arg* const* const argv, const char* const types, const lo_message msg);


int handle_register(const int argc, const lo_arg* const* const argv, const char* const types, const lo_address source);
int handle_unregister();
int handle_update(CARLA_OSC_HANDLE_ARGS2, const lo_address source);
int handle_configure(CARLA_OSC_HANDLE_ARGS2);
int handle_control(CARLA_OSC_HANDLE_ARGS2);
int handle_program(CARLA_OSC_HANDLE_ARGS2);
int handle_midi(CARLA_OSC_HANDLE_ARGS2);
int handle_exiting(CARLA_OSC_HANDLE_ARGS1);
int handle_set_active(CARLA_OSC_HANDLE_ARGS2);
int handle_set_drywet(CARLA_OSC_HANDLE_ARGS2);
int handle_set_volume(CARLA_OSC_HANDLE_ARGS2);
int handle_set_balance_left(CARLA_OSC_HANDLE_ARGS2);
int handle_set_balance_right(CARLA_OSC_HANDLE_ARGS2);
int handle_set_parameter_value(CARLA_OSC_HANDLE_ARGS2);
int handle_set_parameter_midi_cc(CARLA_OSC_HANDLE_ARGS2);
int handle_set_parameter_midi_channel(CARLA_OSC_HANDLE_ARGS2);
int handle_set_program(CARLA_OSC_HANDLE_ARGS2);
int handle_set_midi_program(CARLA_OSC_HANDLE_ARGS2);
int handle_note_on(CARLA_OSC_HANDLE_ARGS2);
int handle_note_off(CARLA_OSC_HANDLE_ARGS2);
int handleMsgRegister(const int argc, const lo_arg* const* const argv, const char* const types, const lo_address source);
int handleMsgUnregister();
int handleMsgUpdate(CARLA_OSC_HANDLE_ARGS2, const lo_address source);
int handleMsgConfigure(CARLA_OSC_HANDLE_ARGS2);
int handleMsgControl(CARLA_OSC_HANDLE_ARGS2);
int handleMsgProgram(CARLA_OSC_HANDLE_ARGS2);
int handleMsgMidi(CARLA_OSC_HANDLE_ARGS2);
int handleMsgExiting(CARLA_OSC_HANDLE_ARGS1);
int handleMsgSetActive(CARLA_OSC_HANDLE_ARGS2);
int handleMsgSetDryWet(CARLA_OSC_HANDLE_ARGS2);
int handleMsgSetVolume(CARLA_OSC_HANDLE_ARGS2);
int handleMsgSetBalanceLeft(CARLA_OSC_HANDLE_ARGS2);
int handleMsgSetBalanceRight(CARLA_OSC_HANDLE_ARGS2);
int handleMsgSetParameterValue(CARLA_OSC_HANDLE_ARGS2);
int handleMsgSetParameterMidiCC(CARLA_OSC_HANDLE_ARGS2);
int handleMsgSetParameterMidiChannel(CARLA_OSC_HANDLE_ARGS2);
int handleMsgSetProgram(CARLA_OSC_HANDLE_ARGS2);
int handleMsgSetMidiProgram(CARLA_OSC_HANDLE_ARGS2);
int handleMsgNoteOn(CARLA_OSC_HANDLE_ARGS2);
int handleMsgNoteOff(CARLA_OSC_HANDLE_ARGS2);


#ifdef WANT_LV2 #ifdef WANT_LV2
int handle_lv2_atom_transfer(CARLA_OSC_HANDLE_ARGS2);
int handle_lv2_event_transfer(CARLA_OSC_HANDLE_ARGS2);
int handleMsgLv2AtomTransfer(CARLA_OSC_HANDLE_ARGS2);
int handleMsgLv2EventTransfer(CARLA_OSC_HANDLE_ARGS2);
#endif #endif


int handle_bridge_set_input_peak_value(CARLA_OSC_HANDLE_ARGS2);
int handle_bridge_set_output_peak_value(CARLA_OSC_HANDLE_ARGS2);
int handleMsgBridgeSetInputPeakValue(CARLA_OSC_HANDLE_ARGS2);
int handleMsgBridgeSetOutputPeakValue(CARLA_OSC_HANDLE_ARGS2);
}; };


CARLA_BACKEND_END_NAMESPACE CARLA_BACKEND_END_NAMESPACE


+ 4
- 4
c++/carla-backend/lv2.cpp View File

@@ -4417,9 +4417,9 @@ private:


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


int CarlaOsc::handle_lv2_atom_transfer(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgLv2AtomTransfer(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_lv2_atom_transfer()");
qDebug("CarlaOsc::handleMsgLv2AtomTransfer()");
CARLA_OSC_CHECK_OSC_TYPES(3, "iss"); CARLA_OSC_CHECK_OSC_TYPES(3, "iss");


const int32_t portIndex = argv[0]->i; const int32_t portIndex = argv[0]->i;
@@ -4438,9 +4438,9 @@ int CarlaOsc::handle_lv2_atom_transfer(CARLA_OSC_HANDLE_ARGS2)
return 0; return 0;
} }


int CarlaOsc::handle_lv2_event_transfer(CARLA_OSC_HANDLE_ARGS2)
int CarlaOsc::handleMsgLv2EventTransfer(CARLA_OSC_HANDLE_ARGS2)
{ {
qDebug("CarlaOsc::handle_lv2_event_transfer()");
qDebug("CarlaOsc::handleMsgLv2EventTransfer()");
CARLA_OSC_CHECK_OSC_TYPES(3, "iss"); CARLA_OSC_CHECK_OSC_TYPES(3, "iss");


const int32_t portIndex = argv[0]->i; const int32_t portIndex = argv[0]->i;


+ 2
- 1
c++/carla-backend/qtcreator/carla-backend.pro View File

@@ -67,7 +67,8 @@ DEFINES += CARLA_ENGINE_JACK
DEFINES += CARLA_ENGINE_RTAUDIO HAVE_GETTIMEOFDAY __LINUX_ALSA__ __LINUX_ALSASEQ__ __LINUX_PULSE__ __RTAUDIO_DEBUG__ __RTMIDI_DEBUG__ DEFINES += CARLA_ENGINE_RTAUDIO HAVE_GETTIMEOFDAY __LINUX_ALSA__ __LINUX_ALSASEQ__ __LINUX_PULSE__ __RTAUDIO_DEBUG__ __RTMIDI_DEBUG__
DEFINES += CARLA_ENGINE_LV2 DEFINES += CARLA_ENGINE_LV2
DEFINES += HAVE_SUIL DEFINES += HAVE_SUIL
#DEFINES += WANT_FLUIDSYNTH WANT_LINUXSAMPLER
DEFINES += WANT_LADSPA WANT_DSSI WANT_LV2 WANT_VST
DEFINES += WANT_FLUIDSYNTH WANT_LINUXSAMPLER


#LIBS += -L../../carla-jackbridge -lcarla-jackbridge-native #LIBS += -L../../carla-jackbridge -lcarla-jackbridge-native




Write Preview
Loading…
Cancel
Save