Update dpf for more vst3 fixes

DISTRHO · Aug 8, 2022 · 759f145 · 759f145
1 parent c84049e
commit 759f145
Show file tree

Hide file tree

Showing 24 changed files with 6,217 additions and 988 deletions.
diff --git a/dpf/Makefile.base.mk b/dpf/Makefile.base.mk
@@ -196,7 +196,10 @@ else
 
 # Common linker flags
 LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-O1,--gc-sections
-ifneq ($(WASM),true)
+ifeq ($(WASM),true)
+LINK_OPTS += -O3
+LINK_OPTS += -sAGGRESSIVE_VARIABLE_ELIMINATION=1
+else
 LINK_OPTS += -Wl,--as-needed
 ifneq ($(SKIP_STRIPPING),true)
 LINK_OPTS += -Wl,--strip-all
@@ -257,7 +260,7 @@ LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
 
 ifeq ($(WASM),true)
 # Special flag for emscripten
-LINK_FLAGS += -sLLD_REPORT_UNDEFINED
+LINK_FLAGS += -sENVIRONMENT=web -sLLD_REPORT_UNDEFINED
 else ifneq ($(MACOS),true)
 # Not available on MacOS
 LINK_FLAGS += -Wl,--no-undefined
@@ -267,6 +270,11 @@ ifeq ($(MACOS_OLD),true)
 BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS) -DHAVE_CPP11_SUPPORT=0
 endif
 
+ifeq ($(WASM_CLIPBOARD),true)
+BUILD_CXX_FLAGS += -DPUGL_WASM_ASYNC_CLIPBOARD
+LINK_FLAGS      += -sASYNCIFY -sASYNCIFY_IMPORTS=puglGetAsyncClipboardData
+endif
+
 ifeq ($(WASM_EXCEPTIONS),true)
 BUILD_CXX_FLAGS += -fexceptions
 LINK_FLAGS      += -fexceptions
@@ -346,7 +354,13 @@ endif
 endif
 
 # backwards compat, always available/enabled
+ifneq ($(FORCE_NATIVE_AUDIO_FALLBACK),true)
+ifeq ($(STATIC_BUILD),true)
+HAVE_JACK = $(shell $(PKG_CONFIG) --exists jack && echo true)
+else
 HAVE_JACK = true
+endif
+endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Set Generic DGL stuff
@@ -410,7 +424,9 @@ else ifeq ($(MACOS),true)
 OPENGL_FLAGS = -DGL_SILENCE_DEPRECATION=1 -Wno-deprecated-declarations
 OPENGL_LIBS  = -framework OpenGL
 else ifeq ($(WASM),true)
-ifneq ($(USE_GLES2),true)
+ifeq ($(USE_GLES2),true)
+OPENGL_LIBS  = -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2
+else
 ifneq ($(USE_GLES3),true)
 OPENGL_LIBS  =  -sLEGACY_GL_EMULATION -sGL_UNSAFE_OPTS=0
 endif

diff --git a/dpf/Makefile.plugins.mk b/dpf/Makefile.plugins.mk
@@ -81,20 +81,23 @@ endif
 else ifneq ($(SKIP_RTAUDIO_FALLBACK),true)
 
 ifeq ($(MACOS),true)
-JACK_LIBS  += -framework CoreAudio -framework CoreFoundation
+JACK_LIBS  += -framework CoreAudio -framework CoreFoundation -framework CoreMIDI
 else ifeq ($(WINDOWS),true)
 JACK_LIBS  += -lole32 -lwinmm
 # DirectSound
 JACK_LIBS  += -ldsound
 # WASAPI
 # JACK_LIBS  += -lksuser -lmfplat -lmfuuid -lwmcodecdspuuid
-else ifeq ($(HAVE_PULSEAUDIO),true)
+else
+ifeq ($(HAVE_PULSEAUDIO),true)
 JACK_FLAGS += $(PULSEAUDIO_FLAGS)
 JACK_LIBS  += $(PULSEAUDIO_LIBS)
-else ifeq ($(HAVE_ALSA),true)
+endif
+ifeq ($(HAVE_ALSA),true)
 JACK_FLAGS += $(ALSA_FLAGS)
 JACK_LIBS  += $(ALSA_LIBS)
 endif
+endif
 
 ifeq ($(HAVE_RTAUDIO),true)
 ifneq ($(HAIKU),true)
@@ -119,6 +122,93 @@ ifeq ($(MACOS),true)
 OBJS_UI += $(BUILD_DIR)/DistrhoUI_macOS_$(NAME).mm.o
 endif
 
+# ---------------------------------------------------------------------------------------------------------------------
+# Handle UI stuff, disable UI support automatically
+
+ifeq ($(FILES_UI),)
+HAVE_DGL = false
+UI_TYPE = none
+endif
+
+ifeq ($(UI_TYPE),)
+UI_TYPE = opengl
+endif
+
+ifeq ($(UI_TYPE),generic)
+ifeq ($(HAVE_OPENGL),true)
+UI_TYPE = opengl
+else ifeq ($(HAVE_CAIRO),true)
+UI_TYPE = cairo
+endif
+endif
+
+ifeq ($(UI_TYPE),cairo)
+ifeq ($(HAVE_CAIRO),true)
+DGL_FLAGS += -DDGL_CAIRO -DHAVE_DGL
+DGL_FLAGS += $(CAIRO_FLAGS)
+DGL_LIBS  += $(CAIRO_LIBS)
+DGL_LIB    = $(DPF_PATH)/build/libdgl-cairo.a
+HAVE_DGL   = true
+else
+HAVE_DGL   = false
+endif
+endif
+
+ifeq ($(UI_TYPE),opengl)
+ifeq ($(HAVE_OPENGL),true)
+DGL_FLAGS += -DDGL_OPENGL -DHAVE_DGL
+DGL_FLAGS += $(OPENGL_FLAGS)
+DGL_LIBS  += $(OPENGL_LIBS)
+DGL_LIB    = $(DPF_PATH)/build/libdgl-opengl.a
+HAVE_DGL   = true
+else
+HAVE_DGL   = false
+endif
+endif
+
+ifeq ($(UI_TYPE),opengl3)
+ifeq ($(HAVE_OPENGL),true)
+DGL_FLAGS += -DDGL_OPENGL -DDGL_USE_OPENGL3 -DHAVE_DGL
+DGL_FLAGS += $(OPENGL_FLAGS)
+DGL_LIBS  += $(OPENGL_LIBS)
+DGL_LIB    = $(DPF_PATH)/build/libdgl-opengl3.a
+HAVE_DGL   = true
+else
+HAVE_DGL   = false
+endif
+endif
+
+ifeq ($(UI_TYPE),vulkan)
+ifeq ($(HAVE_VULKAN),true)
+DGL_FLAGS += -DDGL_VULKAN -DHAVE_DGL
+DGL_FLAGS += $(VULKAN_FLAGS)
+DGL_LIBS  += $(VULKAN_LIBS)
+DGL_LIB    = $(DPF_PATH)/build/libdgl-vulkan.a
+HAVE_DGL   = true
+else
+HAVE_DGL   = false
+endif
+endif
+
+ifeq ($(UI_TYPE),external)
+DGL_FLAGS += -DDGL_EXTERNAL
+HAVE_DGL   = true
+endif
+
+ifeq ($(UI_TYPE),stub)
+ifeq ($(HAVE_STUB),true)
+DGL_LIB    = $(DPF_PATH)/build/libdgl-stub.a
+HAVE_DGL   = true
+else
+HAVE_DGL   = false
+endif
+endif
+
+DGL_LIBS += $(DGL_SYSTEM_LIBS) -lm
+
+# TODO split dsp and ui object build flags
+BASE_FLAGS += $(DGL_FLAGS)
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Set VST2 filename, either single binary or inside a bundle
 
@@ -152,7 +242,18 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # Set plugin binary file targets
 
+ifeq ($(MACOS),true)
+ifeq ($(HAVE_DGL),true)
+MACOS_APP_BUNDLE = true
+endif
+endif
+
+ifeq ($(MACOS_APP_BUNDLE),true)
+jack       = $(TARGET_DIR)/$(NAME).app/Contents/MacOS/$(NAME)
+jackfiles  = $(TARGET_DIR)/$(NAME).app/Contents/Info.plist
+else
 jack       = $(TARGET_DIR)/$(NAME)$(APP_EXT)
+endif
 ladspa_dsp = $(TARGET_DIR)/$(NAME)-ladspa$(LIB_EXT)
 dssi_dsp   = $(TARGET_DIR)/$(NAME)-dssi$(LIB_EXT)
 dssi_ui    = $(TARGET_DIR)/$(NAME)-dssi/$(NAME)_ui$(APP_EXT)
@@ -175,6 +276,17 @@ vst3files += $(TARGET_DIR)/$(VST3_CONTENTS)/PkgInfo
 vst3files += $(TARGET_DIR)/$(VST3_CONTENTS)/Resources/empty.lproj
 endif
 
+ifneq ($(HAVE_DGL),true)
+dssi_ui =
+lv2_ui =
+DGL_LIBS =
+OBJS_UI =
+endif
+
+ifneq ($(HAVE_LIBLO),true)
+dssi_ui =
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Set plugin symbols to export
 
@@ -216,104 +328,6 @@ SYMBOLS_VST3   = -Wl,--version-script=$(DPF_PATH)/utils/symbols/vst3.version
 SYMBOLS_SHARED = -Wl,--version-script=$(DPF_PATH)/utils/symbols/shared.version
 endif
 
-# ---------------------------------------------------------------------------------------------------------------------
-# Handle UI stuff, disable UI support automatically
-
-ifeq ($(FILES_UI),)
-HAVE_DGL = false
-UI_TYPE = none
-endif
-
-ifeq ($(UI_TYPE),)
-UI_TYPE = opengl
-endif
-
-ifeq ($(UI_TYPE),generic)
-ifeq ($(HAVE_OPENGL),true)
-UI_TYPE = opengl
-else ifeq ($(HAVE_CAIRO),true)
-UI_TYPE = cairo
-endif
-endif
-
-ifeq ($(UI_TYPE),cairo)
-ifeq ($(HAVE_CAIRO),true)
-DGL_FLAGS += -DDGL_CAIRO -DHAVE_DGL
-DGL_FLAGS += $(CAIRO_FLAGS)
-DGL_LIBS  += $(CAIRO_LIBS)
-DGL_LIB    = $(DPF_PATH)/build/libdgl-cairo.a
-HAVE_DGL   = true
-else
-HAVE_DGL   = false
-endif
-endif
-
-ifeq ($(UI_TYPE),opengl)
-ifeq ($(HAVE_OPENGL),true)
-DGL_FLAGS += -DDGL_OPENGL -DHAVE_DGL
-DGL_FLAGS += $(OPENGL_FLAGS)
-DGL_LIBS  += $(OPENGL_LIBS)
-DGL_LIB    = $(DPF_PATH)/build/libdgl-opengl.a
-HAVE_DGL   = true
-else
-HAVE_DGL   = false
-endif
-endif
-
-ifeq ($(UI_TYPE),opengl3)
-ifeq ($(HAVE_OPENGL),true)
-DGL_FLAGS += -DDGL_OPENGL -DDGL_USE_OPENGL3 -DHAVE_DGL
-DGL_FLAGS += $(OPENGL_FLAGS)
-DGL_LIBS  += $(OPENGL_LIBS)
-DGL_LIB    = $(DPF_PATH)/build/libdgl-opengl3.a
-HAVE_DGL   = true
-else
-HAVE_DGL   = false
-endif
-endif
-
-ifeq ($(UI_TYPE),vulkan)
-ifeq ($(HAVE_VULKAN),true)
-DGL_FLAGS += -DDGL_VULKAN -DHAVE_DGL
-DGL_FLAGS += $(VULKAN_FLAGS)
-DGL_LIBS  += $(VULKAN_LIBS)
-DGL_LIB    = $(DPF_PATH)/build/libdgl-vulkan.a
-HAVE_DGL   = true
-else
-HAVE_DGL   = false
-endif
-endif
-
-ifeq ($(UI_TYPE),external)
-DGL_FLAGS += -DDGL_EXTERNAL
-HAVE_DGL   = true
-endif
-
-ifeq ($(UI_TYPE),stub)
-ifeq ($(HAVE_STUB),true)
-DGL_LIB    = $(DPF_PATH)/build/libdgl-stub.a
-HAVE_DGL   = true
-else
-HAVE_DGL   = false
-endif
-endif
-
-DGL_LIBS += $(DGL_SYSTEM_LIBS) -lm
-
-ifneq ($(HAVE_DGL),true)
-dssi_ui =
-lv2_ui =
-DGL_LIBS =
-OBJS_UI =
-endif
-
-ifneq ($(HAVE_LIBLO),true)
-dssi_ui =
-endif
-
-# TODO split dsp and ui object build flags
-BASE_FLAGS += $(DGL_FLAGS)
-
 # ---------------------------------------------------------------------------------------------------------------------
 # Runtime test build
 
@@ -415,7 +429,7 @@ $(BUILD_DIR)/DistrhoUIMain_DSSI.cpp.o: $(DPF_PATH)/distrho/DistrhoUIMain.cpp $(E
 # ---------------------------------------------------------------------------------------------------------------------
 # JACK
 
-jack: $(jack)
+jack: $(jack) $(jackfiles)
 
 ifeq ($(HAVE_DGL),true)
 $(jack): $(OBJS_DSP) $(OBJS_UI) $(BUILD_DIR)/DistrhoPluginMain_JACK.cpp.o $(BUILD_DIR)/DistrhoUIMain_JACK.cpp.o $(DGL_LIB)
@@ -539,7 +553,15 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # macOS files
 
-$(TARGET_DIR)/%/Contents/Info.plist: $(DPF_PATH)/utils/plugin.vst/Contents/Info.plist
+$(TARGET_DIR)/%.app/Contents/Info.plist: $(DPF_PATH)/utils/plugin.app/Contents/Info.plist
+	-@mkdir -p $(shell dirname $@)
+	$(SILENT)sed -e "s/@INFO_PLIST_PROJECT_NAME@/$(NAME)/" $< > $@
+
+$(TARGET_DIR)/%.vst/Contents/Info.plist: $(DPF_PATH)/utils/plugin.vst/Contents/Info.plist
+	-@mkdir -p $(shell dirname $@)
+	$(SILENT)sed -e "s/@INFO_PLIST_PROJECT_NAME@/$(NAME)/" $< > $@
+
+$(TARGET_DIR)/%.vst3/Contents/Info.plist: $(DPF_PATH)/utils/plugin.vst/Contents/Info.plist
 	-@mkdir -p $(shell dirname $@)
 	$(SILENT)sed -e "s/@INFO_PLIST_PROJECT_NAME@/$(NAME)/" $< > $@
 

diff --git a/dpf/README.md b/dpf/README.md
@@ -7,7 +7,7 @@ DPF is designed to make development of new plugins an easy and enjoyable task.<b
 It allows developers to create plugins with custom UIs using a simple C++ API.<br/>
 The framework facilitates exporting various different plugin formats from the same code-base.<br/>
 
-DPF can build for LADSPA, DSSI, LV2 and VST formats.<br/>
+DPF can build for LADSPA, DSSI, LV2, VST2 and VST3 formats.<br/>
 All current plugin format implementations are complete.<br/>
 A JACK/Standalone mode is also available, allowing you to quickly test plugins.<br/>
 

diff --git a/dpf/dgl/src/Application.cpp b/dpf/dgl/src/Application.cpp
@@ -16,8 +16,10 @@
 
 #include "ApplicationPrivateData.hpp"
 
-#ifdef __EMSCRIPTEN__
+#if defined(__EMSCRIPTEN__)
 # include <emscripten/emscripten.h>
+#elif defined(DISTRHO_OS_MAC)
+# include <CoreFoundation/CoreFoundation.h>
 #endif
 
 START_NAMESPACE_DGL
@@ -48,8 +50,18 @@ void Application::exec(const uint idleTimeInMs)
 {
     DISTRHO_SAFE_ASSERT_RETURN(pData->isStandalone,);
 
-#ifdef __EMSCRIPTEN__
+#if defined(__EMSCRIPTEN__)
     emscripten_set_main_loop_arg(app_idle, this, 0, true);
+#elif defined(DISTRHO_OS_MAC)
+    const CFTimeInterval idleTimeInSecs = static_cast<CFTimeInterval>(idleTimeInMs) / 1000;
+
+    while (! pData->isQuitting)
+    {
+        pData->idle(0);
+
+        if (CFRunLoopRunInMode(kCFRunLoopDefaultMode, idleTimeInSecs, true) == kCFRunLoopRunFinished)
+            break;
+    }
 #else
     while (! pData->isQuitting)
         pData->idle(idleTimeInMs);