Update surgext

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Jan 5, 2024 · 80bda51 · 80bda51
1 parent 9b502ad
commit 80bda51
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 24 deletions.
diff --git a/plugins/Makefile b/plugins/Makefile
@@ -1026,7 +1026,7 @@ SURGEXT_FLAGS += $(NOFINITE_FLAGS)
 SURGEXT_FLAGS += -std=gnu++17
 SURGEXT_FLAGS += -DTIXML_USE_STL=1
 SURGEXT_FLAGS += \
-	-Isurgext/libs/sst/sst-basic-blocks/include \
+	-Isurgext/libs/sst-rackhelpers/include \
 	-Isurgext/surge/src/common \
 	-Isurgext/surge/src/common/dsp \
 	-Isurgext/surge/src/common/dsp/filters \
@@ -1035,20 +1035,20 @@ SURGEXT_FLAGS += \
 	-Isurgext/surge/src/common/dsp/oscillators \
 	-Isurgext/surge/src/common/dsp/modulators \
 	-Isurgext/surge/src/surge-testrunner \
-	-Isurgext/surge/libs/sst/sst-filters/include \
+	-Isurgext/surge/libs/fmt/include \
+	-Isurgext/surge/libs/LuaJitLib/LuaJIT/src \
+	-Isurgext/surge/libs/sst/sst-basic-blocks/include \
 	-Isurgext/surge/libs/sst/sst-cpputils/include \
-	-Isurgext/surge/libs/sst/sst-waveshapers/include \
+	-Isurgext/surge/libs/sst/sst-effects/include \
+	-Isurgext/surge/libs/sst/sst-filters/include \
 	-Isurgext/surge/libs/sst/sst-plugininfra/include \
 	-Isurgext/surge/libs/sst/sst-plugininfra/libs/tinyxml/include \
 	-Isurgext/surge/libs/sst/sst-plugininfra/libs/filesystem \
-	-Isurgext/surge/libs/fmt/include \
-	-Isurgext/surge/libs/LuaJitLib/LuaJIT/src \
+	-Isurgext/surge/libs/sst/sst-waveshapers/include \
 	-Isurgext/surge/libs/strnatcmp \
 	-Isurgext/surge/src/headless \
 	-Isurgext/surge/libs/tuning-library/include \
 	-I../deps/surge-build/libs/sst/sst-plugininfra/libs/filesystem/include \
-	-include limits \
-	-include cstdint \
 	-DSURGE_COMPILE_BLOCK_SIZE=8 \
 	-DSURGE_SKIP_ODDSOUND_MTS \
 	-DHAS_LUA=0 \
@@ -1403,7 +1403,6 @@ RESOURCE_FILES += surgext/build/surge-data/configuration.xml
 RESOURCE_FILES += surgext/build/surge-data/fx_presets
 RESOURCE_FILES += surgext/build/surge-data/wavetables
 RESOURCE_FILES += surgext/build/surge-data/windows.wt
-RESOURCE_FILES += surgext/patches
 RESOURCE_FILES += $(wildcard surgext/res/xt/fonts/quicksand/*.ttf)
 RESOURCE_FILES += $(wildcard unless_modules/art/*.art)
 RESOURCE_FILES += $(wildcard unless_modules/art/svg/*/*.svg)

diff --git a/plugins/plugins-mini.cpp b/plugins/plugins-mini.cpp
@@ -559,28 +559,34 @@ static void initStatic__surgext()
         // Add the ported ones
         p->addModel(modelSurgeLFO);
         p->addModel(modelSurgeMixer);
+        p->addModel(modelSurgeMixerSlider);
         p->addModel(modelSurgeModMatrix);
         p->addModel(modelSurgeWaveshaper);
         /*
         p->addModel(modelSurgeDelay);
         p->addModel(modelSurgeDelayLineByFreq);
         p->addModel(modelSurgeDelayLineByFreqExpanded);
+        p->addModel(modelSurgeDigitalRingMods);
         p->addModel(modelSurgeVCF);
         */
         spl.removeModule("SurgeXTDelay");
         spl.removeModule("SurgeXTDelayLineByFreq");
         spl.removeModule("SurgeXTDelayLineByFreqExpanded");
+        spl.removeModule("SurgeXTDigitalRingMod");
         spl.removeModule("SurgeXTVCF");
 
+        spl.removeModule("SurgeXTFXBonsai");
         spl.removeModule("SurgeXTFXChorus");
         spl.removeModule("SurgeXTFXChow");
         spl.removeModule("SurgeXTFXCombulator");
+        spl.removeModule("SurgeXTDigitalRingMod");
         spl.removeModule("SurgeXTFXDistortion");
         spl.removeModule("SurgeXTFXExciter");
         spl.removeModule("SurgeXTFXEnsemble");
         spl.removeModule("SurgeXTFXFlanger");
         spl.removeModule("SurgeXTFXFrequencyShifter");
         spl.removeModule("SurgeXTFXNeuron");
+        spl.removeModule("SurgeXTFXNimbus");
         spl.removeModule("SurgeXTFXPhaser");
         spl.removeModule("SurgeXTFXResonator");
         spl.removeModule("SurgeXTFXReverb");
@@ -595,10 +601,14 @@ static void initStatic__surgext()
         p->addModel(modelEGxVCA);
         p->addModel(modelQuadAD);
         p->addModel(modelQuadLFO);
+        p->addModel(modelUnisonHelper);
+        p->addModel(modelUnisonHelperCVExpander);
         */
         spl.removeModule("SurgeXTEGxVCA");
         spl.removeModule("SurgeXTQuadAD");
         spl.removeModule("SurgeXTQuadLFO");
+        spl.removeModule("SurgeXTUnisonHelper");
+        spl.removeModule("SurgeXTUnisonHelperCVExpander");
 
         surgext_rack_initialize();
     }

diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
@@ -2920,9 +2920,11 @@ static void initStatic__surgext()
         p->addModel(modelSurgeDelay);
         p->addModel(modelSurgeDelayLineByFreq);
         p->addModel(modelSurgeDelayLineByFreqExpanded);
+        p->addModel(modelSurgeDigitalRingMods);
         p->addModel(modelSurgeWaveshaper);
         p->addModel(modelSurgeLFO);
         p->addModel(modelSurgeMixer);
+        p->addModel(modelSurgeMixerSlider);
         p->addModel(modelSurgeModMatrix);
 
         p->addModel(modelFXReverb);
@@ -2941,12 +2943,16 @@ static void initStatic__surgext()
         p->addModel(modelFXExciter);
         p->addModel(modelFXEnsemble);
         p->addModel(modelFXCombulator);
+        p->addModel(modelFXNimbus);
         p->addModel(modelFXSpringReverb);
         p->addModel(modelFXTreeMonster);
+        p->addModel(modelFXBonsai);
 
         p->addModel(modelEGxVCA);
         p->addModel(modelQuadAD);
         p->addModel(modelQuadLFO);
+        p->addModel(modelUnisonHelper);
+        p->addModel(modelUnisonHelperCVExpander);
 
         surgext_rack_initialize();
     }

diff --git a/plugins/surgext b/plugins/surgext
diff --git a/plugins/surgext-helper/surgext-helper.cpp b/plugins/surgext-helper/surgext-helper.cpp
@@ -1,18 +1,7 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2023 Filipe Coelho <falktx@falktx.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * For a full copy of the GNU General Public License see the LICENSE file.
+ * Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include "../BaconPlugs/src/Style.hpp"
@@ -25,6 +14,7 @@ void surgext_rack_initialize()
 {
     BaconStyle::get()->activeStyle = rack::settings::preferDarkPanels ? BaconStyle::DARK : BaconStyle::LIGHT;
     XTStyle::initialize();
+    XTStyle::setGlobalStyle(rack::settings::preferDarkPanels ? XTStyle::Style::DARK : XTStyle::Style::LIGHT);
 }
 
 void surgext_rack_update_theme()

diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
@@ -330,8 +330,6 @@ SYMLINKED_DIRS_RESOURCES += Orbits/presets
 SYMLINKED_DIRS_RESOURCES += stoermelder-packone/presets
 SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/fx_presets
 SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/wavetables
-SYMLINKED_DIRS_RESOURCES += surgext/patches
-SYMLINKED_DIRS_RESOURCES += surgext/presets
 endif
 LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalNative.lv2/resources/$(d)@/resources/$(d))