Update for latest carla and dpf

Signed-off-by: falkTX <falktx@falktx.com>

Makefile

@@ -21,13 +21,15 @@ DESTDIR ?=
 # Carla config
 
 CARLA_EXTRA_ARGS = CARLA_BACKEND_NAMESPACE=Ildaeil \
+	CAN_GENERATE_LV2_TTL=false \
+	STATIC_PLUGIN_TARGET=true \
+	USING_CUSTOM_DPF=true \
+	CUSTOM_DPF_PATH=$(CURDIR)/dpf \
 	HAVE_FFMPEG=false \
 	HAVE_FLUIDSYNTH=false \
 	HAVE_PROJECTM=false \
 	HAVE_ZYN_DEPS=false \
-	HAVE_ZYN_UI_DEPS=false \
-	USING_JUCE=false \
-	USING_JUCE_GUI_EXTRA=false
+	HAVE_ZYN_UI_DEPS=false
 
 ifneq ($(DEBUG),true)
 CARLA_EXTRA_ARGS += EXTERNAL_PLUGINS=true
@@ -36,7 +38,7 @@ endif
 # --------------------------------------------------------------
 # Check for X11+OpenGL dependencies
 
-ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
+ifneq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS),true)
 
 ifneq ($(HAVE_OPENGL),true)
 $(error OpenGL dependency not installed/available)
@@ -44,6 +46,9 @@ endif
 ifneq ($(HAVE_X11),true)
 $(error X11 dependency not installed/available)
 endif
+ifneq ($(HAVE_XCURSOR),true)
+$(warning Xcursor dependency not installed/available)
+endif
 ifneq ($(HAVE_XEXT),true)
 $(warning Xext dependency not installed/available)
 endif
@@ -56,9 +61,7 @@ endif
 # --------------------------------------------------------------
 
 carla:
-	$(MAKE) bridges-plugin bridges-ui static-plugin -C carla $(CARLA_EXTRA_ARGS) \
-		CAN_GENERATE_LV2_TTL=false \
-		STATIC_PLUGIN_TARGET=true
+	$(MAKE) bridges-plugin bridges-ui static-plugin -C carla $(CARLA_EXTRA_ARGS)
 
 dgl:
 	$(MAKE) -C dpf/dgl opengl

carla

@@ -1 +1 @@
-Subproject commit 7b8eeef343ae4fd3405361ea06753a26e75f6a89
+Subproject commit 71cbec159f57a6a7296e56b9f4b4d15c799a429f

dpf

@@ -1 +1 @@
-Subproject commit 60c10055eab602e0f29fa0a4446b0f22d8c79696
+Subproject commit 3aa2e83debdc096fe247829ecdebf11d57ab57e6

dpf-widgets

@@ -1 +1 @@
-Subproject commit f40aca55446edfc4a7aaf9dcc6f052e46bbb3de1
+Subproject commit 191da3265214af66fe9b12d0222a8296f8c61230

plugins/Common/IldaeilUI.cpp

@@ -295,9 +295,9 @@ public:
     {
         DISTRHO_SAFE_ASSERT_RETURN(fPluginType == PLUGIN_INTERNAL || fPluginType == PLUGIN_LV2, nullptr);
 
-        Window::FileBrowserOptions opts;
+        FileBrowserOptions opts;
         opts.title = title;
-        getWindow().openFileBrowser(opts);
+        openFileBrowser(opts);
         return nullptr;
     }
 

plugins/Common/Makefile.mk

@@ -44,6 +44,7 @@ CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/lilv.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/rtmempool.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/sfzero.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/water.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/ysfx.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/zita-resampler.a
 
 EXTRA_DEPENDENCIES = $(CARLA_EXTRA_LIBS)

plugins/Common/PluginHostWindow.cpp

@@ -20,6 +20,7 @@
 #if defined(DISTRHO_OS_HAIKU)
 #elif defined(DISTRHO_OS_MAC)
 # import <Cocoa/Cocoa.h>
+#elif defined(DISTRHO_OS_WASM)
 #elif defined(DISTRHO_OS_WINDOWS)
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
@@ -36,6 +37,7 @@ START_NAMESPACE_DGL
 
 #if defined(DISTRHO_OS_HAIKU)
 #elif defined(DISTRHO_OS_MAC)
+#elif defined(DISTRHO_OS_WASM)
 #elif defined(DISTRHO_OS_WINDOWS)
 #else
 static pthread_mutex_t gErrorMutex = PTHREAD_MUTEX_INITIALIZER;
@@ -57,6 +59,7 @@ struct PluginHostWindow::PrivateData
 #elif defined(DISTRHO_OS_MAC)
     NSView* view;
     NSView* subview;
+#elif defined(DISTRHO_OS_WASM)
 #elif defined(DISTRHO_OS_WINDOWS)
     ::HWND pluginWindow;
 #else
@@ -75,6 +78,7 @@ struct PluginHostWindow::PrivateData
 #elif defined(DISTRHO_OS_MAC)
           view(nullptr),
           subview(nullptr),
+#elif defined(DISTRHO_OS_WASM)
 #elif defined(DISTRHO_OS_WINDOWS)
           pluginWindow(nullptr),
 #else
@@ -93,6 +97,7 @@ struct PluginHostWindow::PrivateData
         [view setAutoresizesSubviews:NO];
         [view setHidden:YES];
         [(NSView*)parentWindowId addSubview:view];
+#elif defined(DISTRHO_OS_WASM)
 #elif defined(DISTRHO_OS_WINDOWS)
 #else
         display = XOpenDisplay(nullptr);
@@ -106,6 +111,7 @@ struct PluginHostWindow::PrivateData
 #elif defined(DISTRHO_OS_MAC)
         if (view != nullptr)
             [view release];
+#elif defined(DISTRHO_OS_WASM)
 #elif defined(DISTRHO_OS_WINDOWS)
 #else
         if (display != nullptr)
@@ -121,6 +127,8 @@ struct PluginHostWindow::PrivateData
 #elif defined(DISTRHO_OS_MAC)
         subview = nullptr;
         return view;
+#elif defined(DISTRHO_OS_WASM)
+        return nullptr;
 #elif defined(DISTRHO_OS_WINDOWS)
         pluginWindow = nullptr;
         return (void*)parentWindowId;
@@ -137,6 +145,7 @@ struct PluginHostWindow::PrivateData
         if (view != nullptr)
             [view setHidden:YES];
         [NSOpenGLContext clearCurrentContext];
+#elif defined(DISTRHO_OS_WASM)
 #elif defined(DISTRHO_OS_WINDOWS)
         if (pluginWindow != nullptr)
         {
@@ -168,6 +177,7 @@ struct PluginHostWindow::PrivateData
 #elif defined(DISTRHO_OS_WINDOWS)
             if (pluginWindow == nullptr)
                 pluginWindow = FindWindowExA((::HWND)parentWindowId, nullptr, nullptr, nullptr);
+#elif defined(DISTRHO_OS_WASM)
 #else
             if (display == nullptr)
                 return;
@@ -210,6 +220,7 @@ struct PluginHostWindow::PrivateData
                 pluginWindowCallbacks->pluginWindowResized(width * scaleFactor, height * scaleFactor);
             }
         }
+#elif defined(DISTRHO_OS_WASM)
 #elif defined(DISTRHO_OS_WINDOWS)
         if (pluginWindow != nullptr)
         {
@@ -301,6 +312,7 @@ struct PluginHostWindow::PrivateData
             const double scaleFactor = [[[view window] screen] backingScaleFactor];
             [view setFrame:NSMakeRect(x / scaleFactor, y / scaleFactor, width / scaleFactor, height / scaleFactor)];
         }
+#elif defined(DISTRHO_OS_WASM)
 #elif defined(DISTRHO_OS_WINDOWS)
         // unused
         (void)width;