Browse Source

Adjust for liblo API breakage, dont define lo_message type

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.5.9
falkTX 8 months ago
parent
commit
1950c68edf
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 5 additions and 6 deletions
  1. +1
    -2
      source/backend/CarlaPlugin.hpp
  2. +1
    -1
      source/backend/plugin/CarlaPlugin.cpp
  3. +3
    -3
      source/backend/plugin/CarlaPluginLADSPADSSI.cpp

+ 1
- 2
source/backend/CarlaPlugin.hpp View File

@@ -24,7 +24,6 @@
// -----------------------------------------------------------------------
// Avoid including extra libs here

typedef void* lo_message;
typedef struct _NativePluginDescriptor NativePluginDescriptor;
struct LADSPA_RDF_Descriptor;

@@ -774,7 +773,7 @@ public:
int argc,
const void* argv,
const char* types,
lo_message msg);
void* msg);

// -------------------------------------------------------------------
// MIDI events


+ 1
- 1
source/backend/plugin/CarlaPlugin.cpp View File

@@ -2350,7 +2350,7 @@ void CarlaPlugin::clearBuffers() noexcept
// OSC stuff

// FIXME
void CarlaPlugin::handleOscMessage(const char* const, const int, const void* const, const char* const, const lo_message)
void CarlaPlugin::handleOscMessage(const char*, int, const void*, const char*, void*)
{
// do nothing
}


+ 3
- 3
source/backend/plugin/CarlaPluginLADSPADSSI.cpp View File

@@ -2395,9 +2395,9 @@ public:
// -------------------------------------------------------------------
// OSC stuff

void handleOscMessage(const char* const method, const int argc, const void* const argvx, const char* const types, const lo_message msg) override
void handleOscMessage(const char* const method, const int argc, const void* const argvx, const char* const types, void* const msg) override
{
const lo_address source(lo_message_get_source(msg));
const lo_address source = lo_message_get_source(static_cast<lo_message>(msg));
CARLA_SAFE_ASSERT_RETURN(source != nullptr,);

// protocol for DSSI UIs *must* be UDP
@@ -2432,7 +2432,7 @@ public:
if (std::strcmp(method, "midi") == 0)
return handleOscMessageMIDI(argc, argv, types);
if (std::strcmp(method, "update") == 0)
return handleOscMessageUpdate(argc, argv, types, lo_message_get_source(msg));
return handleOscMessageUpdate(argc, argv, types, source);
if (std::strcmp(method, "exiting") == 0)
return handleOscMessageExiting();



Loading…
Cancel
Save