Browse Source

Fix build

tags/v0.9.0
falkTX 12 years ago
parent
commit
7defff5280
9 changed files with 16 additions and 16 deletions
  1. +1
    -1
      c++/carla-engine/carla_engine_osc.cpp
  2. +1
    -1
      c++/carla-plugin/carla_bridge.cpp
  3. +5
    -5
      c++/carla-plugin/carla_plugin.cpp
  4. +1
    -1
      c++/carla-plugin/dssi.cpp
  5. +2
    -2
      c++/carla-plugin/fluidsynth.cpp
  6. +2
    -2
      c++/carla-plugin/linuxsampler.cpp
  7. +1
    -1
      c++/carla-plugin/lv2.cpp
  8. +2
    -2
      c++/carla-plugin/native.cpp
  9. +1
    -1
      c++/carla-plugin/vst.cpp

+ 1
- 1
c++/carla-engine/carla_engine_osc.cpp View File

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


+ 1
- 1
c++/carla-plugin/carla_bridge.cpp View File

@@ -1015,7 +1015,7 @@ CarlaPlugin* CarlaPlugin::newBridge(const initializer& init, BinaryType btype, P
}

//plugin->reload();
plugin->registerToOscControl();
plugin->registerToOscClient();

return plugin;
}


+ 5
- 5
c++/carla-plugin/carla_plugin.cpp View File

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



+ 1
- 1
c++/carla-plugin/dssi.cpp View File

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



+ 2
- 2
c++/carla-plugin/fluidsynth.cpp View File

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


+ 2
- 2
c++/carla-plugin/linuxsampler.cpp View File

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


+ 1
- 1
c++/carla-plugin/lv2.cpp View File

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



+ 2
- 2
c++/carla-plugin/native.cpp View File

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


+ 1
- 1
c++/carla-plugin/vst.cpp View File

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



Loading…
Cancel
Save