Update to latest carla, dpf, and pugl, needs testing

Signed-off-by: falkTX <falktx@falktx.com>
CryptoneanLabs · May 28, 2022 · bcd1b9e · bcd1b9e
1 parent 11d9d6a
commit bcd1b9e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -199,7 +199,9 @@ carla:
 ifneq ($(STATIC_BUILD),true)
 	$(MAKE) static-plugin -C carla $(CARLA_EXTRA_ARGS) \
 		CAN_GENERATE_LV2_TTL=false \
-		STATIC_PLUGIN_TARGET=true
+		CUSTOM_DPF_PATH=$(CURDIR)/dpf \
+		STATIC_PLUGIN_TARGET=true \
+		USING_CUSTOM_DPF=true
 endif
 
 deps:

diff --git a/carla b/carla
diff --git a/dpf b/dpf
diff --git a/jucewrapper/CMakeLists.txt b/jucewrapper/CMakeLists.txt
@@ -28,9 +28,6 @@ set_property(TARGET native_plugins PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_
 add_library(audio_decoder STATIC IMPORTED)
 set_property(TARGET audio_decoder PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/Release/audio_decoder.a")
 
-add_library(carla_dgl STATIC IMPORTED)
-set_property(TARGET carla_dgl PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/Release/dgl.a")
-
 add_library(jackbridge STATIC IMPORTED)
 set_property(TARGET jackbridge PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/Release/jackbridge.min.a")
 
@@ -173,7 +170,6 @@ target_link_libraries(Cardinal
         carla_plugin
         native_plugins
         audio_decoder
-        carla_dgl
         jackbridge
         lilv
         rtmempool
@@ -264,7 +260,6 @@ target_link_libraries(CardinalFX
         carla_plugin
         native_plugins
         audio_decoder
-        carla_dgl
         jackbridge
         lilv
         rtmempool
@@ -355,7 +350,6 @@ target_link_libraries(CardinalSynth
         carla_plugin
         native_plugins
         audio_decoder
-        carla_dgl
         jackbridge
         lilv
         rtmempool

diff --git a/plugins/Cardinal/src/plugincontext.hpp b/plugins/Cardinal/src/plugincontext.hpp
@@ -21,7 +21,7 @@
 #include "DistrhoUtils.hpp"
 
 #ifndef HEADLESS
-# include "dgl/Base.hpp"
+# include "../dgl/Base.hpp"
 #else
 # include "extra/LeakDetector.hpp"
 #endif

diff --git a/src/CardinalUI.cpp b/src/CardinalUI.cpp
@@ -47,17 +47,8 @@ GLFWAPI const char* glfwGetClipboardString(GLFWwindow*)
     DISTRHO_SAFE_ASSERT_RETURN(context != nullptr, nullptr);
     DISTRHO_SAFE_ASSERT_RETURN(context->ui != nullptr, nullptr);
 
-    const char* mimeType = nullptr;
-    size_t dataSize = 0;
-
-    if (const void* const clipboard = context->ui->getClipboard(mimeType, dataSize))
-    {
-        if (mimeType == nullptr || std::strcmp(mimeType, "text/plain") != 0)
-            return nullptr;
-        return static_cast<const char*>(clipboard);
-    }
-
-    return nullptr;
+    size_t dataSize;
+    return static_cast<const char*>(context->ui->getClipboard(dataSize));
 }
 
 GLFWAPI void glfwSetClipboardString(GLFWwindow*, const char* const text)
@@ -268,7 +259,6 @@ class CardinalUI : public CardinalBaseUI,
         {
             if (context->window != nullptr)
                 WindowParametersSave(context->window);
-            rack::contextSet(nullptr);
         }
     };
 
@@ -619,13 +609,8 @@ class CardinalUI : public CardinalBaseUI,
         switch (ev.button)
         {
         case 1: button = GLFW_MOUSE_BUTTON_LEFT;   break;
-       #ifdef DISTRHO_OS_MAC
         case 2: button = GLFW_MOUSE_BUTTON_RIGHT;  break;
         case 3: button = GLFW_MOUSE_BUTTON_MIDDLE; break;
-       #else
-        case 2: button = GLFW_MOUSE_BUTTON_MIDDLE; break;
-        case 3: button = GLFW_MOUSE_BUTTON_RIGHT;  break;
-       #endif
         default:
             button = ev.button;
             break;
@@ -778,6 +763,17 @@ class CardinalUI : public CardinalBaseUI,
         setState("windowSize", sizeString);
     }
 
+    uint32_t uiClipboardDataOffer() override
+    {
+        const std::vector<ClipboardDataOffer> offers(getClipboardDataOfferTypes());
+
+        for (const ClipboardDataOffer offer : offers)
+            if (std::strcmp(offer.type, "text/plain") == 0)
+                return offer.id;
+
+        return 0;
+    }
+
     void uiFocus(const bool focus, const CrossingMode mode) override
     {
         if (focus)

diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
@@ -38,9 +38,6 @@ CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_engine_
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_plugin.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/native-plugins.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/audio_decoder.a
-ifneq ($(HEADLESS),true)
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/dgl.a
-endif
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/jackbridge.min.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/lilv.a
 CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/rtmempool.a
+2 −0		Makefile
+6 −2		source/Makefile.mk
+1 −1		source/native-plugins/external
+56 −15		dgl/Base.hpp
+112 −0		dgl/OpenGL-include.hpp
+5 −92		dgl/OpenGL.hpp
+1 −1		dgl/TopLevelWidget.hpp
+33 −36		dgl/Widget.hpp
+30 −11		dgl/Window.hpp
+4 −4		dgl/src/TopLevelWidget.cpp
+34 −15		dgl/src/Window.cpp
+142 −52		dgl/src/WindowPrivateData.cpp
+12 −4		dgl/src/WindowPrivateData.hpp
+1 −1		dgl/src/pugl-upstream
+136 −225		dgl/src/pugl.cpp
+28 −68		dgl/src/pugl.hpp
+18 −1		distrho/DistrhoUI.hpp
+1 −1		distrho/DistrhoUIMain.cpp
+19 −23		distrho/src/DistrhoPluginCarla.cpp
+12 −2		distrho/src/DistrhoUI.cpp
+17 −2		distrho/src/DistrhoUIPrivateData.hpp
+10 −0		pugl-updates-notes.txt
+3 −150		tests/Demo.cpp
+207 −0		tests/widgets/ResizeHandle.hpp