From 7defff5280ab13d248a7967e5630993bc936e5f0 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 18 Dec 2012 16:57:16 +0000 Subject: [PATCH] Fix build --- c++/carla-engine/carla_engine_osc.cpp | 2 +- c++/carla-plugin/carla_bridge.cpp | 2 +- c++/carla-plugin/carla_plugin.cpp | 10 +++++----- c++/carla-plugin/dssi.cpp | 2 +- c++/carla-plugin/fluidsynth.cpp | 4 ++-- c++/carla-plugin/linuxsampler.cpp | 4 ++-- c++/carla-plugin/lv2.cpp | 2 +- c++/carla-plugin/native.cpp | 4 ++-- c++/carla-plugin/vst.cpp | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/c++/carla-engine/carla_engine_osc.cpp b/c++/carla-engine/carla_engine_osc.cpp index 0adc6fe..ad91523 100644 --- a/c++/carla-engine/carla_engine_osc.cpp +++ b/c++/carla-engine/carla_engine_osc.cpp @@ -353,7 +353,7 @@ int CarlaEngineOsc::handleMsgRegister(const int argc, const lo_arg* const* const CarlaPlugin* const plugin = engine->getPluginUnchecked(i); if (plugin && plugin->enabled()) - plugin->registerToOscControl(); + plugin->registerToOscClient(); } return 0; diff --git a/c++/carla-plugin/carla_bridge.cpp b/c++/carla-plugin/carla_bridge.cpp index 1e535ae..3c7a873 100644 --- a/c++/carla-plugin/carla_bridge.cpp +++ b/c++/carla-plugin/carla_bridge.cpp @@ -1015,7 +1015,7 @@ CarlaPlugin* CarlaPlugin::newBridge(const initializer& init, BinaryType btype, P } //plugin->reload(); - plugin->registerToOscControl(); + plugin->registerToOscClient(); return plugin; } diff --git a/c++/carla-plugin/carla_plugin.cpp b/c++/carla-plugin/carla_plugin.cpp index 182e78c..9b97cad 100644 --- a/c++/carla-plugin/carla_plugin.cpp +++ b/c++/carla-plugin/carla_plugin.cpp @@ -1267,7 +1267,7 @@ void CarlaPlugin::postEventsRun() #ifndef BUILD_BRIDGE // Update OSC control client - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) x_engine->osc_send_control_set_parameter_value(m_id, event->value1, event->value3); #endif @@ -1282,7 +1282,7 @@ void CarlaPlugin::postEventsRun() #ifndef BUILD_BRIDGE // Update OSC control client - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) { x_engine->osc_send_control_set_program(m_id, event->value1); @@ -1302,7 +1302,7 @@ void CarlaPlugin::postEventsRun() #ifndef BUILD_BRIDGE // Update OSC control client - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) { x_engine->osc_send_control_set_midi_program(m_id, event->value1); @@ -1321,7 +1321,7 @@ void CarlaPlugin::postEventsRun() #ifndef BUILD_BRIDGE // Update OSC control client - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) x_engine->osc_send_control_note_on(m_id, event->value1, event->value2, rint(event->value3)); #endif @@ -1335,7 +1335,7 @@ void CarlaPlugin::postEventsRun() #ifndef BUILD_BRIDGE // Update OSC control client - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) x_engine->osc_send_control_note_off(m_id, event->value1, event->value2); #endif diff --git a/c++/carla-plugin/dssi.cpp b/c++/carla-plugin/dssi.cpp index 74fea8d..13266e0 100644 --- a/c++/carla-plugin/dssi.cpp +++ b/c++/carla-plugin/dssi.cpp @@ -811,7 +811,7 @@ public: #ifndef BUILD_BRIDGE // Update OSC Names - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) { x_engine->osc_send_control_set_midi_program_count(m_id, midiprog.count); diff --git a/c++/carla-plugin/fluidsynth.cpp b/c++/carla-plugin/fluidsynth.cpp index 4cc8467..d2ddd2c 100644 --- a/c++/carla-plugin/fluidsynth.cpp +++ b/c++/carla-plugin/fluidsynth.cpp @@ -802,7 +802,7 @@ public: //f_sfont->free(f_sfont); // Update OSC Names - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) { x_engine->osc_send_control_set_midi_program_count(m_id, midiprog.count); @@ -1355,7 +1355,7 @@ CarlaPlugin* CarlaPlugin::newSF2(const initializer& init) } plugin->reload(); - plugin->registerToOscControl(); + plugin->registerToOscClient(); return plugin; #else diff --git a/c++/carla-plugin/linuxsampler.cpp b/c++/carla-plugin/linuxsampler.cpp index c3d15cb..944c19a 100644 --- a/c++/carla-plugin/linuxsampler.cpp +++ b/c++/carla-plugin/linuxsampler.cpp @@ -415,7 +415,7 @@ public: } // Update OSC Names - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) { x_engine->osc_send_control_set_midi_program_count(m_id, midiprog.count); @@ -951,7 +951,7 @@ CarlaPlugin* LinuxSamplerPlugin::newLinuxSampler(const initializer& init, bool i } plugin->reload(); - plugin->registerToOscControl(); + plugin->registerToOscClient(); return plugin; } diff --git a/c++/carla-plugin/lv2.cpp b/c++/carla-plugin/lv2.cpp index 894704d..d1f94fa 100644 --- a/c++/carla-plugin/lv2.cpp +++ b/c++/carla-plugin/lv2.cpp @@ -1869,7 +1869,7 @@ public: #ifndef BUILD_BRIDGE // Update OSC Names - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) { x_engine->osc_send_control_set_midi_program_count(m_id, midiprog.count); diff --git a/c++/carla-plugin/native.cpp b/c++/carla-plugin/native.cpp index d51f76f..d833b30 100644 --- a/c++/carla-plugin/native.cpp +++ b/c++/carla-plugin/native.cpp @@ -758,7 +758,7 @@ public: } // Update OSC Names - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) { x_engine->osc_send_control_set_midi_program_count(m_id, midiprog.count); @@ -1675,7 +1675,7 @@ CarlaPlugin* CarlaPlugin::newNative(const initializer& init) } } - plugin->registerToOscControl(); + plugin->registerToOscClient(); return plugin; } diff --git a/c++/carla-plugin/vst.cpp b/c++/carla-plugin/vst.cpp index 481241c..351ee52 100644 --- a/c++/carla-plugin/vst.cpp +++ b/c++/carla-plugin/vst.cpp @@ -836,7 +836,7 @@ public: #ifndef BUILD_BRIDGE // Update OSC Names - if (x_engine->isOscControlRegisted()) + if (x_engine->isOscControlRegistered()) { x_engine->osc_send_control_set_program_count(m_id, prog.count);