Adjust for liblo API breakage, dont define lo_message type

Signed-off-by: falkTX <falktx@falktx.com>
falkTX · Mar 7, 2024 · 9370483 · 9370483
1 parent fe8631b
commit 9370483
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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<lo_message>(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();