diff --git a/Makefile b/Makefile index b128c437..427ca242 100644 --- a/Makefile +++ b/Makefile @@ -173,7 +173,7 @@ endif deps: ifeq ($(SYSDEPS),true) - $(MAKE) quickjs surge -C deps + $(MAKE) quickjs -C deps else $(MAKE) all -C deps endif @@ -371,10 +371,6 @@ TAR_ARGS = \ --exclude=plugins/BogaudioModules/res-src \ --exclude=plugins/Cardinal/orig \ --exclude=plugins/GrandeModular/res-src \ - --exclude=plugins/surgext/surge/libs/JUCE \ - --exclude=plugins/surgext/surge/resources/data/patches_3rdparty \ - --exclude=plugins/surgext/surge/resources/data/patches_factory \ - --exclude=plugins/surgext/surge/resources/data/wavetables_3rdparty \ --exclude=src/Rack/adapters \ --exclude=src/Rack/dep/filesystem/cmake \ --exclude=src/Rack/dep/filesystem/examples \ diff --git a/deps/Makefile b/deps/Makefile index 6e985d45..48774d6b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -248,67 +248,6 @@ $(RACK_DEP_PATH)/lib/libquickjs.a: install -m644 $(CURDIR)/QuickJS/libquickjs.a $@ install -m644 $(CURDIR)/QuickJS/quickjs.h $(RACK_DEP_PATH)/include/quickjs.h -# -------------------------------------------------------------- -# SurgeXT target - -SURGE_DEP_PATH = $(abspath surge-build) -SURGE_SRC_PATH = $(abspath ../plugins/surgext/surge) -SURGE_NAMES = HysteresisProcessing Patch SolverType Tunings Wavetable clouds ghc plaits stmlib - -SURGE_CXX_FLAGS = $(filter-out -fsingle-precision-constant,$(filter-out -std=gnu++11,$(BUILD_CXX_FLAGS))) -SURGE_CXX_FLAGS += $(foreach n,$(SURGE_NAMES),-D$(n)=surgext$(n)) - -# fix build with gcc13 -SURGE_CXX_FLAGS += -include cstdint - -# fix JUCE build https://github.com/juce-framework/JUCE/issues/374 -ifeq ($(CPU_I386),true) -SURGE_CXX_FLAGS += -D__sigemptyset=sigemptyset -endif - -# use custom JUCE -SURGE_CXX_FLAGS += -I$(abspath ../deps/JUCE/modules) - -# possibly use fftw? -# ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true) -# SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1 -# endif - -# JUCE_USE_CURL -SURGE_ENV = env \ - AR=$(AR) \ - CC=$(CC) \ - CXX=$(CXX) \ - CFLAGS='$(BUILD_C_FLAGS) -w' \ - CXXFLAGS='$(SURGE_CXX_FLAGS) -w' \ - LDFLAGS='$(LINK_FLAGS)' - -SURGE_LIB = $(SURGE_DEP_PATH)/src/common/libsurge-common.a - -$(SURGE_LIB): $(SURGE_DEP_PATH)/Makefile - +$(DEP_MAKE) -C $(SURGE_DEP_PATH) surge-common - -$(SURGE_DEP_PATH)/Makefile: $(SURGE_SRC_PATH)/CMakeLists.txt - mkdir -p $(SURGE_DEP_PATH) - cd $(SURGE_DEP_PATH) && \ - $(SURGE_ENV) $(CMAKE) \ - -DSURGE_BUILD_32BIT_LINUX=TRUE \ - -DSURGE_COMPILE_BLOCK_SIZE=8 \ - -DSURGE_SKIP_AIRWINDOWS=TRUE \ - -DSURGE_SKIP_JUCE_FOR_RACK=TRUE \ - -DSURGE_SKIP_LUA=TRUE \ - -DSURGE_SKIP_ODDSOUND_MTS=TRUE \ - -DSURGE_JUCE_PATH=$(abspath ../deps/JUCE) \ - -DSURGE_SIMDE_PATH=$(abspath ../src/Rack/dep/simde) \ - $(SURGE_SRC_PATH) - -# -------------------------------------------------------------- -# Build targets - -ifneq ($(NOPLUGINS),true) -TARGETS += $(SURGE_LIB) -endif - TARGETS += $(RACK_DEP_PATH)/lib/libjansson.a TARGETS += $(RACK_DEP_PATH)/lib/libquickjs.a TARGETS += $(RACK_DEP_PATH)/lib/libsamplerate.a @@ -343,7 +282,6 @@ clean: rm -rf $(RACK_DEP_PATH)/speexdsp/libspeexdsp/*.o rm -rf $(RACK_DEP_PATH)/speexdsp/Makefile rm -rf $(RACK_DEP_PATH)/zstd-1.4.5 - rm -rf $(SURGE_DEP_PATH) download: \ $(RACK_DEP_PATH)/jansson-2.12 \ @@ -352,6 +290,5 @@ download: \ $(RACK_DEP_PATH)/zstd-1.4.5/.stamp-patched quickjs: $(RACK_DEP_PATH)/lib/libquickjs.a -surge: $(SURGE_LIB) # -------------------------------------------------------------- diff --git a/plugins/Makefile b/plugins/Makefile index 9bcbbccc..661ca490 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1077,90 +1077,6 @@ PLUGIN_FILES += $(filter-out $(STOERMELDER_PACKONE_IGNORED:%=stoermelder-packone STOERMELDER_PACKONE_CUSTOM = LongPressButton STOERMELDER_PACKONE_CUSTOM_PER_FILE = InputLedDisplay IntermixEnvModule -# -------------------------------------------------------------- -# surgext - -PLUGIN_FILES += $(filter-out surgext/src/SurgeXT.cpp,$(wildcard surgext/src/*.cpp)) -PLUGIN_FILES += surgext-helper/surgext-helper.cpp - -# modules/types which are present in other plugins -SURGEXT_CUSTOM = HysteresisProcessing Patch SolverType Tunings Wavetable ghc clouds plaits stmlib - -SURGEXT_FLAGS = $(filter-out -fsingle-precision-constant,$(filter-out -std=gnu++11,$(BUILD_CXX_FLAGS))) -SURGEXT_FLAGS += -std=gnu++17 -SURGEXT_FLAGS += -DTIXML_USE_STL=1 -SURGEXT_FLAGS += \ - -Isurgext/libs/sst-rackhelpers/include \ - -Isurgext/surge/src/common \ - -Isurgext/surge/src/common/dsp \ - -Isurgext/surge/src/common/dsp/filters \ - -Isurgext/surge/src/common/dsp/vembertech \ - -Isurgext/surge/src/common/dsp/utilities \ - -Isurgext/surge/src/common/dsp/oscillators \ - -Isurgext/surge/src/common/dsp/modulators \ - -Isurgext/surge/src/surge-testrunner \ - -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-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/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 \ - -DSURGE_COMPILE_BLOCK_SIZE=8 \ - -DSURGE_SKIP_ODDSOUND_MTS \ - -DHAS_LUA=0 \ - -DHAS_JUCE=0 \ - -DSKIP_JUCE=1 - -ifneq ($(DEBUG),true) -SURGEXT_FLAGS += -DRELEASE=1 -endif - -ifeq ($(MACOS),true) -SURGEXT_FLAGS += -Wno-undefined-bool-conversion -Wno-unused-variable -Wno-reorder -Wno-char-subscripts -Wno-sign-compare -Wno-ignored-qualifiers -Wno-c++17-extensions -Wno-unused-private-field -SURGEXT_FLAGS += -DMAC -else ifeq ($(WINDOWS),true) -SURGEXT_FLAGS += -Wno-suggest-override -Wno-sign-compare -Wno-ignored-qualifiers -Wno-unused-variable -Wno-char-subscripts -Wno-reorder -Wno-int-in-bool-context -SURGEXT_FLAGS += -DWINDOWS -SURGEXT_FLAGS += -DSKIP_MINGW_FORMAT -else -SURGEXT_FLAGS += -Wno-unused-value -Wno-suggest-override -Wno-implicit-fallthrough -Wno-ignored-qualifiers -SURGEXT_FLAGS += -Wno-nonnull-compare -Wno-sign-compare -Wno-char-subscripts -Wno-unused-variable -Wno-unused-but-set-variable -Wno-reorder -Wno-multichar -SURGEXT_FLAGS += -DLINUX -SURGEXT_FLAGS += -Isurge/src/linux -endif - -SURGEXT_FLAGS += -DSURGE_RACK_BASE_VERSION=XT1-0-1 -SURGEXT_FLAGS += -DSURGE_RACK_PLUG_VERSION=Cardinal -SURGEXT_FLAGS += -DSURGE_RACK_SURGE_VERSION=Cardinal - -SURGEXT_FLAGS += -I$(abspath ../carla/source/modules) - -MINIPLUGIN_FILES += surgext/src/Delay.cpp -MINIPLUGIN_FILES += surgext/src/DelayLineByFreq.cpp -MINIPLUGIN_FILES += surgext/src/DelayLineByFreqExpanded.cpp -MINIPLUGIN_FILES += surgext/src/EGxVCA.cpp -MINIPLUGIN_FILES += surgext/src/FX.cpp -MINIPLUGIN_FILES += surgext/src/LFO.cpp -MINIPLUGIN_FILES += surgext/src/Mixer.cpp -MINIPLUGIN_FILES += surgext/src/ModMatrix.cpp -MINIPLUGIN_FILES += surgext/src/QuadAD.cpp -MINIPLUGIN_FILES += surgext/src/QuadLFO.cpp -MINIPLUGIN_FILES += surgext/src/VCO.cpp -MINIPLUGIN_FILES += surgext/src/VCF.cpp -MINIPLUGIN_FILES += surgext/src/Waveshaper.cpp -MINIPLUGIN_FILES += surgext/src/XTModule.cpp -MINIPLUGIN_FILES += surgext/src/XTModuleWidget.cpp -MINIPLUGIN_FILES += surgext/src/XTStyle.cpp -MINIPLUGIN_FILES += surgext-helper/surgext-helper.cpp - # -------------------------------------------------------------- # unless_modules @@ -1423,7 +1339,6 @@ endif clean: rm -f *.a rm -rf $(BUILD_DIR) - rm -rf surgext/build # -------------------------------------------------------------- @@ -1468,22 +1383,12 @@ RESOURCE_FILES += MindMeldModular/res/ShapeMaster/MindMeldShapes RESOURCE_FILES += Mog/res RESOURCE_FILES += nonlinearcircuits/res RESOURCE_FILES += ParableInstruments/res/Neil.png -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 += $(wildcard StarlingVia/res/original.*) -RESOURCE_FILES += $(wildcard surgext/res/xt/fonts/quicksand/*.ttf) RESOURCE_FILES += $(wildcard unless_modules/art/*.art) RESOURCE_FILES += $(wildcard unless_modules/art/svg/*/*.svg) RESOURCE_FILES += $(wildcard unless_modules/font/*.ttf) # RESOURCE_FILES += $(wildcard unless_modules/manual/*) -JACK_RESOURCES = $(CURDIR)/surgext/build/surge-data/configuration.xml -JACK_RESOURCES += $(CURDIR)/surgext/build/surge-data/fx_presets -JACK_RESOURCES += $(CURDIR)/surgext/build/surge-data/wavetables -JACK_RESOURCES += $(CURDIR)/surgext/build/surge-data/windows.wt - RESOURCE_FILES += $(wildcard Cardinal/res/*.png) RESOURCE_FILES += Cardinal/res/Miku/Miku.png @@ -1493,7 +1398,6 @@ MINIPLUGIN_LIST += AudibleInstruments MINIPLUGIN_LIST += BogaudioModules MINIPLUGIN_LIST += Fundamental MINIPLUGIN_LIST += MockbaModular -MINIPLUGIN_LIST += surgext # MINIPLUGIN_LIST += ValleyAudio MINIRESOURCE_FILES = AriaModules/res/components/jack-transparent.svg @@ -1689,37 +1593,6 @@ MINIRESOURCE_FILES += MockbaModular/res/screw.svg MINIRESOURCE_FILES += MockbaModular/res/selector.svg MINIRESOURCE_FILES += MockbaModular/res/Shapah.svg -MINIRESOURCE_FILES += surgext/build/surge-data/configuration.xml -MINIRESOURCE_FILES += surgext/build/surge-data/windows.wt -MINIRESOURCE_FILES += surgext/res/xt/fonts/quicksand/Quicksand-Regular.ttf -MINIRESOURCE_FILES += surgext/res/xt/fonts/quicksand/Quicksand-Bold.ttf -MINIRESOURCE_FILES += surgext/res/xt/dark/components/fader_bg.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/fader_bg_25.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/fader_handle.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-9.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-12.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-14.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-16.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-pointer-9.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-pointer-12.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-pointer-14.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/knob-pointer-16.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/mod-button.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/components/port.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/panels/fx/BlankNoDisplay.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/panels/other/EGLFO.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/panels/other/Matrix.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/panels/other/Mixer.svg -MINIRESOURCE_FILES += surgext/res/xt/dark/panels/vco/BlankVCO.svg -MINIRESOURCE_FILES += surgext/res/xt/glyphs/lt_0.svg -MINIRESOURCE_FILES += surgext/res/xt/glyphs/lt_1.svg -MINIRESOURCE_FILES += surgext/res/xt/glyphs/lt_2.svg -MINIRESOURCE_FILES += surgext/res/xt/glyphs/lt_3.svg -MINIRESOURCE_FILES += surgext/res/xt/glyphs/lt_4.svg -MINIRESOURCE_FILES += surgext/res/xt/glyphs/lt_5.svg -MINIRESOURCE_FILES += surgext/res/xt/glyphs/lt_6.svg -MINIRESOURCE_FILES += surgext/res/xt/glyphs/lt_7.svg - # MINIRESOURCE_FILES += ValleyAudio/res/DexterPanelDark.svg # MINIRESOURCE_FILES += ValleyAudio/res/InterzonePanelDark.svg # MINIRESOURCE_FILES += ValleyAudio/res/LightLEDButton80.svg @@ -2008,23 +1881,6 @@ else $(SILENT)ln -sf $(abspath $<) $@ endif -%/surgext/build/surge-data/configuration.xml: surgext/surge/resources/surge-shared/configuration.xml - -@mkdir -p "$(shell dirname $@)" - $(SILENT)ln -sf $(abspath $<) $@ - -%/surgext/build/surge-data/fx_presets: - -@mkdir -p "$@" - cp -R surgext/surge/resources/data/fx_presets/* $@/ - cp -R surgext/res/surge_extra_data/fx_presets/* $@/ - -%/surgext/build/surge-data/wavetables: surgext/surge/resources/data/wavetables - -@mkdir -p "$(shell dirname $@)" - $(SILENT)ln -sf $(abspath $<) $@ - -%/surgext/build/surge-data/windows.wt: surgext/surge/resources/surge-shared/windows.wt - -@mkdir -p "$(shell dirname $@)" - $(SILENT)ln -sf $(abspath $<) $@ - # -------------------------------------------------------------- # Build commands @@ -2763,13 +2619,6 @@ $(BUILD_DIR)/stocaudio/%.cpp.o: stocaudio/%.cpp $(foreach m,$(STOCAUDIO_CUSTOM),$(call custom_module_names,$(m),stocaudio)) \ -DpluginInstance=pluginInstance__stocaudio -$(BUILD_DIR)/surgext%.cpp.o: surgext%.cpp - -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" - @echo "Compiling $<" - $(SILENT)$(CXX) $< $(SURGEXT_FLAGS) -c -o $@ \ - $(foreach m,$(SURGEXT_CUSTOM),$(call custom_module_names,$(m),surgext)) \ - -DpluginInstance=pluginInstance__surgext - $(BUILD_DIR)/unless_modules/%.cpp.o: unless_modules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins-mini.cpp b/plugins/plugins-mini.cpp index fadda3cd..72a2a9fb 100644 --- a/plugins/plugins-mini.cpp +++ b/plugins/plugins-mini.cpp @@ -67,11 +67,6 @@ extern Model* modelUnison; #undef loadBack std::string loadBack(int) { return "res/Empty_gray.svg"; } -// surgext -#include "surgext/src/SurgeXT.h" -void surgext_rack_initialize(); -void surgext_rack_update_theme(); - // ValleyAudio #include "ValleyAudio/src/Valley.hpp" @@ -85,7 +80,6 @@ Plugin* pluginInstance__Aria; Plugin* pluginInstance__AudibleInstruments; Plugin* pluginInstance__BogaudioModules; Plugin* pluginInstance__MockbaModular; -Plugin* pluginInstance__surgext; Plugin* pluginInstance__ValleyAudio; namespace rack { @@ -525,95 +519,6 @@ static void initStatic__MockbaModular() } } -static void initStatic__surgext() -{ - Plugin* const p = new Plugin; - pluginInstance__surgext = p; - - const StaticPluginLoader spl(p, "surgext"); - if (spl.ok()) - { - p->addModel(modelVCOModern); - p->addModel(modelVCOSine); - /* - p->addModel(modelVCOAlias); - p->addModel(modelVCOClassic); - p->addModel(modelVCOFM2); - p->addModel(modelVCOFM3); - p->addModel(modelVCOSHNoise); - p->addModel(modelVCOString); - p->addModel(modelVCOTwist); - p->addModel(modelVCOWavetable); - p->addModel(modelVCOWindow); - */ - spl.removeModule("SurgeXTOSCAlias"); - spl.removeModule("SurgeXTOSCClassic"); - spl.removeModule("SurgeXTOSCFM2"); - spl.removeModule("SurgeXTOSCFM3"); - spl.removeModule("SurgeXTOSCSHNoise"); - spl.removeModule("SurgeXTOSCString"); - spl.removeModule("SurgeXTOSCTwist"); - spl.removeModule("SurgeXTOSCWavetable"); - spl.removeModule("SurgeXTOSCWindow"); - - // 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"); - - p->addModel(modelFXNimbus); - 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("SurgeXTFXPhaser"); - spl.removeModule("SurgeXTFXResonator"); - spl.removeModule("SurgeXTFXReverb"); - spl.removeModule("SurgeXTFXReverb2"); - spl.removeModule("SurgeXTFXRingMod"); - spl.removeModule("SurgeXTFXRotarySpeaker"); - spl.removeModule("SurgeXTFXSpringReverb"); - spl.removeModule("SurgeXTFXTreeMonster"); - spl.removeModule("SurgeXTFXVocoder"); - - /* - 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(); - } -} - /* static void initStatic__ValleyAudio() { @@ -644,7 +549,6 @@ void initStaticPlugins() initStatic__AudibleInstruments(); initStatic__BogaudioModules(); initStatic__MockbaModular(); - initStatic__surgext(); /* initStatic__ValleyAudio(); */ @@ -670,10 +574,6 @@ void updateStaticPluginsDarkMode() listener->defaultSkinChanged(skins._default); } } - // surgext - { - surgext_rack_update_theme(); - } } } diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 421faf39..9c89df46 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -851,11 +851,6 @@ StoermelderSettings pluginSettings; void StoermelderSettings::saveToJson() {} void StoermelderSettings::readFromJson() {} -// surgext -#include "surgext/src/SurgeXT.h" -void surgext_rack_initialize(); -void surgext_rack_update_theme(); - // unless_modules #include "unless_modules/src/unless.hpp" @@ -972,7 +967,6 @@ Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__StarlingVia; Plugin* pluginInstance__stocaudio; extern Plugin* pluginInstance__stoermelder_p1; -Plugin* pluginInstance__surgext; Plugin* pluginInstance__unless_modules; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__Voxglitch; @@ -3230,69 +3224,6 @@ static void initStatic__stoermelder_p1() } } -static void initStatic__surgext() -{ - Plugin* const p = new Plugin; - pluginInstance__surgext = p; - - const StaticPluginLoader spl(p, "surgext"); - if (spl.ok()) - { - p->addModel(modelVCOClassic); - p->addModel(modelVCOModern); - p->addModel(modelVCOWavetable); - p->addModel(modelVCOWindow); - p->addModel(modelVCOSine); - p->addModel(modelVCOFM2); - p->addModel(modelVCOFM3); - p->addModel(modelVCOSHNoise); - p->addModel(modelVCOAlias); - p->addModel(modelVCOString); - p->addModel(modelVCOTwist); - - // Add the ported ones - p->addModel(modelSurgeVCF); - 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); - p->addModel(modelFXPhaser); - p->addModel(modelFXRotarySpeaker); - p->addModel(modelFXDistortion); - p->addModel(modelFXFrequencyShifter); - p->addModel(modelFXChorus); - p->addModel(modelFXVocoder); - p->addModel(modelFXReverb2); - p->addModel(modelFXFlanger); - p->addModel(modelFXRingMod); - p->addModel(modelFXNeuron); - p->addModel(modelFXResonator); - p->addModel(modelFXChow); - 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(); - } -} - static void initStatic__unless_modules() { Plugin* const p = new Plugin; @@ -3499,7 +3430,6 @@ void initStaticPlugins() initStatic__StarlingVia(); initStatic__stocaudio(); initStatic__stoermelder_p1(); - initStatic__surgext(); initStatic__unless_modules(); initStatic__ValleyAudio(); initStatic__Voxglitch(); @@ -3536,10 +3466,6 @@ void updateStaticPluginsDarkMode() { gtg_default_theme = darkMode ? 1 : 0; } - // surgext - { - surgext_rack_update_theme(); - } } } diff --git a/plugins/surgext b/plugins/surgext deleted file mode 160000 index cbebb2b5..00000000 --- a/plugins/surgext +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cbebb2b5d5d6b5dc865660fb3ef54d2c35bfa0f1 diff --git a/plugins/surgext-helper/surgext-helper.cpp b/plugins/surgext-helper/surgext-helper.cpp deleted file mode 100644 index 059ea542..00000000 --- a/plugins/surgext-helper/surgext-helper.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2024 Filipe Coelho - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -#include "../BaconPlugs/src/Style.hpp" -#include "../surgext/src/XTStyle.h" - -using namespace baconpaul::rackplugs; -using namespace sst::surgext_rack::style; - -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() -{ - BaconStyle::get()->activeStyle = rack::settings::preferDarkPanels ? BaconStyle::DARK : BaconStyle::LIGHT; - BaconStyle::get()->notifyStyleListeners(); - - XTStyle::setGlobalStyle(rack::settings::preferDarkPanels ? XTStyle::Style::DARK : XTStyle::Style::LIGHT); - XTStyle::notifyStyleListeners(); -} diff --git a/src/CardinalRemote/Makefile b/src/CardinalRemote/Makefile index 8c891642..f1eba203 100644 --- a/src/CardinalRemote/Makefile +++ b/src/CardinalRemote/Makefile @@ -89,31 +89,6 @@ endif RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libzstd.a endif -# -------------------------------------------------------------- -# surgext libraries - -ifneq ($(NOPLUGINS),true) -SURGE_DEP_PATH = $(abspath ../../deps/surge-build) -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/src/common/libsurge-common.a -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/src/common/libjuce_dsp_rack_sub.a -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/airwindows/libairwindows.a -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/eurorack/libeurorack.a -ifeq ($(DEBUG),true) -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/fmt/libfmtd.a -else -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/fmt/libfmt.a -endif -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sqlite-3.23.3/libsqlite.a -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libsst-plugininfra.a -ifneq ($(WINDOWS),true) -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/filesystem/libfilesystem.a -endif -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/strnatcmp/libstrnatcmp.a -RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/tinyxml/libtinyxml.a -endif - -# -------------------------------------------------------------- - # FIXME ifeq ($(CIBUILD)$(WASM),truetrue) ifneq ($(STATIC_BUILD),true)