Merge branch 'main' into feature/add-starling-via

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: build
 on: [push, pull_request]
 
 env:
-  CACHE_VERSION: 9
+  CACHE_VERSION: 10
   CARDINAL_UNDER_WINE: 1
   CIBUILD: true
   DEBIAN_FRONTEND: noninteractive
@@ -333,7 +333,7 @@ jobs:
         run: |
           ${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
           source deps/PawPaw/local.env wasm
-          make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) -C src/CardinalMiniSep modgui
+          make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) modgui
       - name: Make wasm versioned and compress
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash

Makefile

@@ -10,12 +10,11 @@ include $(ROOT)/Makefile.base.mk
 # Set version
 
 # also set in:
-# jucewrapper/CMakeLists.txt `project`
 # src/CardinalCommon.cpp `CARDINAL_VERSION`
 # src/CardinalPlugin.cpp `getVersion`
 # utils/macOS/Info_{JACK,Native}.plist
-# jucewrapper/CMakeLists.txt src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist
-VERSION = 24.01
+# src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist
+VERSION = 24.03
 
 # --------------------------------------------------------------
 # Build targets
@@ -128,7 +127,6 @@ EXTRA_MOD_FLAGS += -ffat-lto-objects
 endif
 
 MOD_ENVIRONMENT += HEADLESS=true
-MOD_ENVIRONMENT += MOD_BUILD=true
 MOD_ENVIRONMENT += STATIC_BUILD=true
 
 # --------------------------------------------------------------
@@ -227,6 +225,9 @@ vst2: carla deps dgl plugins resources
 vst3: carla deps dgl plugins resources
 	$(MAKE) vst3 -C src $(CARLA_EXTRA_ARGS)
 
+modgui:
+	$(MAKE) modgui -C src/CardinalMiniSep
+
 # --------------------------------------------------------------
 # Packaging standalone for CI
 

deps/PawPaw

@@ -1 +1 @@
-Subproject commit 777177562ef39836b9e0963e7910d55e3d2d0636
+Subproject commit b84d0ec2d1bb5c7d7fd05d4a8d7f4af71306c425

dpf

@@ -1 +1 @@
-Subproject commit 0ceb411fde5192ad4aaa1c89b079a861e4dac5df
+Subproject commit 045b943199393053c606b530fc882661502d53d7

plugins/Befaco

@@ -1 +1 @@
-Subproject commit 4c55f117212e758324412efe73f2f573a18f75d3
+Subproject commit d3ad6c6732cee8a80197aa351dd9efef9c278d4c

plugins/Makefile

@@ -555,7 +555,7 @@ PLUGIN_FILES += $(filter-out Befaco/src/plugin.cpp,$(wildcard Befaco/src/*.cpp))
 PLUGIN_FILES += $(wildcard Befaco/src/noise-plethora/*/*.cpp)
 
 # modules/types which are present in other plugins
-BEFACO_CUSTOM = ADSR Mixer chowdsp
+BEFACO_CUSTOM = ADSR Mixer chowdsp Burst
 
 # --------------------------------------------------------------
 # Bidoo

plugins/plugins.cpp

@@ -137,9 +137,11 @@ extern Model* modelChord;
 // Befaco
 #define modelADSR modelBefacoADSR
 #define modelMixer modelBefacoMixer
+#define modelBurst modelBefacoBurst
 #include "Befaco/src/plugin.hpp"
 #undef modelADSR
 #undef modelMixer
+#undef modelBurst
 
 // Bidoo
 #include "Bidoo/src/plugin.hpp"
@@ -1515,6 +1517,7 @@ static void initStatic__Befaco()
     {
 #define modelADSR modelBefacoADSR
 #define modelMixer modelBefacoMixer
+#define modelBurst modelBefacoBurst
         p->addModel(modelEvenVCO);
         p->addModel(modelRampage);
         p->addModel(modelABC);
@@ -1536,8 +1539,11 @@ static void initStatic__Befaco()
         p->addModel(modelChannelStrip);
         p->addModel(modelPonyVCO);
         p->addModel(modelMotionMTR);
+        p->addModel(modelBurst);
+        p->addModel(modelVoltio);
 #undef modelADSR
 #undef modelMixer
+#undef modelBurst
     }
 }
 

src/CardinalCommon.cpp

@@ -99,7 +99,7 @@ void destroyStaticPlugins();
 }
 }
 
-const std::string CARDINAL_VERSION = "24.01";
+const std::string CARDINAL_VERSION = "24.03";
 
 START_NAMESPACE_DISTRHO
 

src/CardinalPlugin.cpp

@@ -406,7 +406,7 @@ protected:
 
     uint32_t getVersion() const override
     {
-        return d_version(0, 24, 1);
+        return d_version(0, 24, 3);
     }
 
     int64_t getUniqueId() const override

src/custom/dep.cpp

@@ -413,6 +413,7 @@ static const struct {
     { kModeBefaco, "/Befaco/res/components/Knurlie.svg" },
     { kModeBefaco, "/Befaco/res/panels/ABC.svg" },
     { kModeBefaco, "/Befaco/res/panels/ADSR.svg" },
+    { kModeBefaco, "/Befaco/res/panels/Burst.svg" },
     { kModeBefaco, "/Befaco/res/panels/ChoppingKinky.svg" },
     { kModeBefaco, "/Befaco/res/panels/DualAtenuverter.svg" },
     { kModeBefaco, "/Befaco/res/panels/EvenVCO.svg" },
@@ -432,6 +433,7 @@ static const struct {
     { kModeBefaco, "/Befaco/res/panels/SlewLimiter.svg" },
     { kModeBefaco, "/Befaco/res/panels/SpringReverb.svg" },
     { kModeBefaco, "/Befaco/res/panels/StereoStrip.svg" },
+    { kModeBefaco, "/Befaco/res/panels/Voltio.svg" },
     // GPLv3+
     { kModeCardinal, "/Cardinal/res/AudioFile.svg" },
     { kModeCardinal, "/Cardinal/res/AudioToCVPitch.svg" },

utils/macOS/Info_JACK.plist

@@ -11,11 +11,11 @@
 	<key>CFBundleIdentifier</key>
 	<string>studio.kx.distrho.cardinal.jack</string>
 	<key>CFBundleShortVersionString</key>
-	<string>23.01</string>
+	<string>23.03</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.15</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>(C) 2011-2023 Filipe Coelho.
+	<string>(C) 2011-2024 Filipe Coelho.
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or any later version.</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>

utils/macOS/Info_Native.plist

@@ -11,11 +11,11 @@
 	<key>CFBundleIdentifier</key>
 	<string>studio.kx.distrho.cardinal.native</string>
 	<key>CFBundleShortVersionString</key>
-	<string>24.01</string>
+	<string>24.03</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.15</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>(C) 2011-2023 Filipe Coelho.
+	<string>(C) 2011-2024 Filipe Coelho.
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or any later version.</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>