From 9370483b0a278eab6462c33b16e53377f7fffc6c Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 7 Mar 2024 10:10:56 +0100 Subject: [PATCH] Adjust for liblo API breakage, dont define lo_message type Signed-off-by: falkTX --- source/backend/CarlaPlugin.hpp | 3 +-- source/backend/plugin/CarlaPlugin.cpp | 2 +- source/backend/plugin/CarlaPluginLADSPADSSI.cpp | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/backend/CarlaPlugin.hpp b/source/backend/CarlaPlugin.hpp index 7020f699ff19018f74d429cd10b1977142bf9a80..35ee2f18889f31e40bb72d470af3ff08e22498f7 100644 --- a/source/backend/CarlaPlugin.hpp +++ b/source/backend/CarlaPlugin.hpp @@ -24,7 +24,6 @@ // ----------------------------------------------------------------------- // Avoid including extra libs here -typedef void* lo_message; typedef struct _NativePluginDescriptor NativePluginDescriptor; struct LADSPA_RDF_Descriptor; @@ -778,7 +777,7 @@ class CARLA_API CarlaPlugin int argc, const void* argv, const char* types, - lo_message msg); + void* msg); // ------------------------------------------------------------------- // MIDI events diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp index 56f1e78387642a793f684a8c5b4d22861de05204..d1485cf95cb44b61c7caf3c6e7db411e8e6549e3 100644 --- a/source/backend/plugin/CarlaPlugin.cpp +++ b/source/backend/plugin/CarlaPlugin.cpp @@ -2368,7 +2368,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 } diff --git a/source/backend/plugin/CarlaPluginLADSPADSSI.cpp b/source/backend/plugin/CarlaPluginLADSPADSSI.cpp index fa2ad19352c56d542567fa952bcfa19e32380557..a39a4b7130c16ddf54075e151b444523f86e0787 100644 --- a/source/backend/plugin/CarlaPluginLADSPADSSI.cpp +++ b/source/backend/plugin/CarlaPluginLADSPADSSI.cpp @@ -2404,9 +2404,9 @@ class CarlaPluginLADSPADSSI : public CarlaPlugin // ------------------------------------------------------------------- // 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(msg)); CARLA_SAFE_ASSERT_RETURN(source != nullptr,); // protocol for DSSI UIs *must* be UDP @@ -2441,7 +2441,7 @@ class CarlaPluginLADSPADSSI : public CarlaPlugin 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();