From 2910b8ee4e611b3f70fc9a44830891d453a29e26 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 23 May 2024 14:30:18 +0200
Subject: [PATCH] Update to latest carla

Signed-off-by: falkTX <falktx@falktx.com>
---
 carla                            | 2 +-
 deps/Makefile                    | 4 ----
 dpf                              | 2 +-
 plugins/Cardinal/src/AIDA-X.cpp  | 1 +
 plugins/Cardinal/src/Ildaeil.cpp | 8 ++++----
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/carla b/carla
index 3c7d0e7..95ad25d 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 3c7d0e7b914d38a32b733cc5ced0b5696d2f9a03
+Subproject commit 95ad25d81d1ba53a205f9c758aa51ff91d5dabaf
diff --git a/deps/Makefile b/deps/Makefile
index a5bd941..29cca40 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -266,9 +266,6 @@ ifeq ($(CPU_I386),true)
 SURGE_CXX_FLAGS += -D__sigemptyset=sigemptyset
 endif
 
-# use custom JUCE from DISTRHO and Carla
-SURGE_CXX_FLAGS += -I$(abspath ../carla/source/modules)
-
 # possibly use fftw?
 # ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true)
 # SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1
@@ -298,7 +295,6 @@ $(SURGE_DEP_PATH)/Makefile: $(SURGE_SRC_PATH)/CMakeLists.txt
 		-DSURGE_SKIP_JUCE_FOR_RACK=TRUE \
 		-DSURGE_SKIP_LUA=TRUE \
 		-DSURGE_SKIP_ODDSOUND_MTS=TRUE \
-		-DSURGE_JUCE_PATH=$(abspath ../carla/source) \
 		-DSURGE_SIMDE_PATH=$(abspath ../src/Rack/dep/simde) \
 		$(SURGE_SRC_PATH)
 
diff --git a/dpf b/dpf
index 01aca76..feaa5d3 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 01aca7649c1a3a5ee20a47c5ecd3cb2e29395f89
+Subproject commit feaa5d35709e669c1212b8012078586b3b622567
diff --git a/plugins/Cardinal/src/AIDA-X.cpp b/plugins/Cardinal/src/AIDA-X.cpp
index 1c9f889..af1dc7a 100644
--- a/plugins/Cardinal/src/AIDA-X.cpp
+++ b/plugins/Cardinal/src/AIDA-X.cpp
@@ -439,6 +439,7 @@ struct AidaPluginModule : Module {
         model = newmodel.release();
 
         // if processing, wait for process cycle to complete
+        using DISTRHO_NAMESPACE::d_msleep;
         while (oldmodel != nullptr && activeModel.load())
             d_msleep(1);
 
diff --git a/plugins/Cardinal/src/Ildaeil.cpp b/plugins/Cardinal/src/Ildaeil.cpp
index 9ed7212..98f568e 100644
--- a/plugins/Cardinal/src/Ildaeil.cpp
+++ b/plugins/Cardinal/src/Ildaeil.cpp
@@ -629,11 +629,11 @@ struct IldaeilModule : Module {
 
         CarlaEngine* const engine = carla_get_engine_from_handle(fCarlaHostHandle);
 
-        water::XmlDocument xml(projectState);
+        water::XmlDocument xmlState{water::String(projectState)};
 
         {
             const MutexLocker cml(sPluginInfoLoadMutex);
-            engine->loadProjectInternal(xml, true);
+            engine->loadProjectInternal(xmlState, true);
         }
 
         projectLoadedFromDSP(fUI);
@@ -1664,7 +1664,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
         // save plugin info into cache
         if (sha1sum != nullptr)
         {
-            const water::String configDir(asset::config("Ildaeil"));
+            const String configDir(asset::config("Ildaeil").c_str());
             const water::File cacheFile(configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum);
 
             if (cacheFile.create().ok())
@@ -1755,7 +1755,7 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Runner {
         if (sha1sum == nullptr)
             return false;
 
-        const water::String configDir(asset::config("Ildaeil"));
+        const String configDir(asset::config("Ildaeil").c_str());
         const water::File cacheFile(configDir + CARLA_OS_SEP_STR "cache" CARLA_OS_SEP_STR + sha1sum);
 
         if (cacheFile.existsAsFile())