Merge branch 'DISTRHO:main' into docb-modules

Makefile

@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 # DISTRHO Cardinal Plugin
-# Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
+# Copyright (C) 2021-2025 Filipe Coelho <falktx@falktx.com>
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 ROOT = .
 include $(ROOT)/Makefile.base.mk
 
-# -----------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Set version
 
 # also set in:
@@ -17,18 +17,18 @@ include $(ROOT)/Makefile.base.mk
 # .github/ISSUE_TEMPLATE/bug.yaml src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist
 VERSION = 25.06
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Build targets
 
 all: cardinal carla deps dgl plugins gen resources
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Build config
 
 PREFIX  ?= /usr/local
 DESTDIR ?=
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Carla config
 
 CARLA_EXTRA_ARGS = \
@@ -44,7 +44,16 @@ ifneq ($(DEBUG),true)
 CARLA_EXTRA_ARGS += EXTERNAL_PLUGINS=true
 endif
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
+# DGL config
+
+ifeq ($(WASM),true)
+UI_TYPE = gles2
+else
+UI_TYPE = opengl
+endif
+
+# ---------------------------------------------------------------------------------------------------------------------
 # Check for required system-wide dependencies
 
 ifeq ($(SYSDEPS),true)
@@ -183,7 +192,7 @@ endif
 
 dgl:
 ifneq ($(HEADLESS),true)
-	$(MAKE) opengl -C dpf/dgl $(DGL_EXTRA_ARGS)
+	$(MAKE) $(UI_TYPE) -C dpf/dgl $(DGL_EXTRA_ARGS)
 endif
 
 plugins: deps

carla

@@ -1 +1 @@
-Subproject commit c9b60551497a7a9b76d86d694b6af08afe96335c
+Subproject commit 034d0c4242ba834e0b5a8967a5eefedf9d97178c

dpf

@@ -1 +1 @@
-Subproject commit 8c30f9f1eddba89805f4131aeb2d6ca3e31a46b1
+Subproject commit 79e5339bef455583a4b5762addfd6578d4230f05

plugins/CVfunk

@@ -1 +1 @@
-Subproject commit a116e6b18ac05974a23509cc47adfd86e8406385
+Subproject commit 51f2b4e61cde7978fb84cdd892a1d3aaedc0ff5b

plugins/Makefile

@@ -678,7 +678,7 @@ COMPUTERSCARE_CUSTOM = Quantizer PanelBorder
 PLUGIN_FILES += $(filter-out CVfunk/src/plugin.cpp,$(wildcard CVfunk/src/*.cpp))
 
 # modules/types which are present in other plugins
-CVFUNK_CUSTOM = Steps
+CVFUNK_CUSTOM = Steps Node
 
 # --------------------------------------------------------------
 # dBiz

plugins/plugins.cpp

@@ -343,9 +343,11 @@ extern Model* modelTestVCF;
 #include "cf/src/plugin.hpp"
 
 // CVfunk
+#define modelNode modelCVfunkNode
 #define modelSteps modelCVfunkSteps
 #include "CVfunk/src/plugin.hpp"
 #undef modelSteps
+#undef modelNode
 
 // ChowDSP
 #include "ChowDSP/src/plugin.hpp"
@@ -2142,6 +2144,7 @@ static void initStatic__CVfunk()
     if (spl.ok())
     {
         #define modelSteps modelCVfunkSteps
+        #define modelNode modelCVfunkNode
         p->addModel(modelSteps);
         p->addModel(modelEnvelopeArray);
         p->addModel(modelPentaSequencer);
@@ -2163,6 +2166,16 @@ static void initStatic__CVfunk()
         p->addModel(modelPreeeeeeeeeeessedDuck);
         p->addModel(modelArrange);
         p->addModel(modelTriDelay);
+        p->addModel(modelTatami);
+        p->addModel(modelCartesia);
+        p->addModel(modelJunkDNA);
+        p->addModel(modelPicus);
+        p->addModel(modelNode);
+        p->addModel(modelWeave);
+        p->addModel(modelWonk);
+        p->addModel(modelHammer);
+        p->addModel(modelHub);
+        #undef modelNode
         #undef modelSteps
     }
 }

src/Makefile.cardinal.mk

@@ -264,6 +264,7 @@ endif
 
 ifeq ($(WASM),true)
 APP_EXT = .js
+UI_TYPE = gles2
 endif
 
 USE_VST2_BUNDLE = true

src/override/Scene.cpp

@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2021-2025 Filipe Coelho <falktx@falktx.com>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
@@ -207,20 +207,23 @@ void Scene::step() {
 				(internal->historyActionIndex != actionIndex
 				&& actionIndex > 0
 				&& time - internal->lastSceneChangeTime >= 1.0)) {
-				remoteDetails->first = false;
-
-				const std::string& name(APP->history->actions[actionIndex - 1]->name);
-				static const std::vector<std::string> ignoredNames = {
-					"move knob",
-					"move modules",
-					"move switch",
-				};
-				if (std::find(ignoredNames.cbegin(), ignoredNames.cend(), name) == ignoredNames.cend()) {
-					printf("action '%s'\n", APP->history->actions[actionIndex - 1]->name.c_str());
+				if (remoteDetails->first) {
+					remoteDetails->first = false;
 					remoteUtils::sendFullPatchToRemote(remoteDetails);
-
-					if (remoteDetails->screenshot) {
-						window::generateScreenshot();
+				} else {
+					const std::string& name(APP->history->actions[actionIndex - 1]->name);
+					static const std::vector<std::string> ignoredNames = {
+						"move knob",
+						"move modules",
+						"move switch",
+					};
+					if (std::find(ignoredNames.cbegin(), ignoredNames.cend(), name) == ignoredNames.cend()) {
+						d_debug("action '%s'\n", APP->history->actions[actionIndex - 1]->name.c_str());
+						remoteUtils::sendFullPatchToRemote(remoteDetails);
+
+						if (remoteDetails->screenshot) {
+							window::generateScreenshot();
+						}
 					}
 				}
 				internal->historyActionIndex = actionIndex;