From 315f2d444d8a68e7e71ba9627898d03ff3dfecb2 Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Sun, 10 Nov 2024 15:43:18 -0500 Subject: [PATCH 01/13] Added Admiral to gitmodules --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index 0c21bd0..031eac9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -257,3 +257,6 @@ [submodule "plugins/rcm-modules"] path = plugins/rcm-modules url = https://github.com/Rcomian/rcm-modules.git +[submodule "plugins/admiral"] + path = plugins/admiral + url = https://github.com/wapiflapi/admiral.git From 55c8ef8e570d7481a4d50c2f668517724d9904d0 Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Sun, 10 Nov 2024 15:47:31 -0500 Subject: [PATCH 02/13] Added Admiral to Makefile --- plugins/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugins/Makefile b/plugins/Makefile index d912281..3064c77 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -346,6 +346,11 @@ PLUGIN_FILES += $(wildcard AaronStatic/src/*.cpp) # modules/types which are present in other plugins AARONSTATIC_CUSTOM = RefreshCounter +# -------------------------------------------------------------- +# Admiral + +PLUGIN_FILES += $(filter-out admiral/src/plugin.cpp,$(wildcard admiral/src/*.cpp)) + # -------------------------------------------------------------- # AmalgamatedHarmonics @@ -2129,6 +2134,13 @@ $(BUILD_DIR)/AaronStatic/%.cpp.o: AaronStatic/%.cpp -DpluginInstance=pluginInstance__AaronStatic \ -Dinit=init__AaronStatic +$(BUILD_DIR)/admiral/%.cpp.o: admiral/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(ADMIRAL_CUSTOM),$(call custom_module_names,$(m),admiral)) \ + -DpluginInstance=pluginInstance__admiral + $(BUILD_DIR)/alefsbits/%.cpp.o: alefsbits/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" From 02d8084d671bdc35924b7fc6cae23f4ea2290871 Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Sun, 10 Nov 2024 15:49:07 -0500 Subject: [PATCH 03/13] Add Admiral to plugins.cpp. --- plugins/plugins.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 01905d1..df43654 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -27,6 +27,15 @@ // Aaron Static #include "AaronStatic/src/plugin.hpp" +// Admiral +/* NOTE too much noise in original include, do this a different way +// #include "admiral/src/plugin.hpp" +*/ +extern Model* modelWatches; +extern Model* modelShifts; +extern Model* modelTables; +extern Model* modelDivisions; + // Alef's Bits #define modelSteps modelalefsbitsSteps #define modelLogic modelalefsbitsLogic @@ -907,6 +916,7 @@ Plugin* pluginInstance__Fundamental; Plugin* pluginInstance__21kHz; Plugin* pluginInstance__8Mode; extern Plugin* pluginInstance__AaronStatic; +Plugin* pluginInstance__admiral; Plugin* pluginInstance__alefsbits; Plugin* pluginInstance__Algoritmarte; Plugin* pluginInstance__AmalgamatedHarmonics; @@ -1245,6 +1255,21 @@ static void initStatic__AaronStatic() } } +static void initStatic__admiral() +{ + Plugin* const p = new Plugin; + pluginInstance__admiral = p; + + const StaticPluginLoader spl(p, "admiral"); + if (spl.ok()) + { + p->addModel(modelWatches); + p->addModel(modelShifts); + p->addModel(modelTables); + p->addModel(modelDivisions); + } +} + static void initStatic__alefsbits() { Plugin* const p = new Plugin; @@ -3473,6 +3498,7 @@ void initStaticPlugins() initStatic__21kHz(); initStatic__8Mode(); initStatic__AaronStatic(); + initStatic__admiral(); initStatic__alefsbits(); initStatic__Algoritmarte(); initStatic__AmalgamatedHarmonics(); From 9756765a82b1431ac4b202eb4964708af3de68c3 Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Sun, 10 Nov 2024 16:00:09 -0500 Subject: [PATCH 04/13] README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5878800..3de00ba 100644 --- a/README.md +++ b/README.md @@ -122,6 +122,7 @@ At the moment the following 3rd-party modules are provided: - [21kHz](https://github.com/netboy3/21kHz-rack-plugins) - [8Mode](https://github.com/8Mode/8Mode-VCV_Modules) - [Aaron Static](https://github.com/aaronstatic/AaronStatic_modules) +- [Admiral](https://github.com/wapiflapi/admiral) - [alef's bits](https://github.com/alefnull/alefsbits) - [AlgoritmArte](https://github.com/algoritmarte/AlgoritmarteVCVPlugin) - [Amalgamated Harmonics](https://github.com/jhoar/AmalgamatedHarmonics) From f4c1d78b8fc33ac9b98c1da9ffe6132cb945dd63 Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Sun, 10 Nov 2024 16:02:45 -0500 Subject: [PATCH 06/13] Add Admiral to DIFFERENCES.md --- docs/DIFFERENCES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/DIFFERENCES.md b/docs/DIFFERENCES.md index ef31a08..adbc4b8 100644 --- a/docs/DIFFERENCES.md +++ b/docs/DIFFERENCES.md @@ -46,6 +46,7 @@ Bellow follows a list of features comparing the official plugin to Cardinal. Additionally, Cardinal contains the following built-in modules not present in the official plugin or standalone: + * Admiral (never updated to v2) * Aria Salvatrice modules (except Arcane related modules, due to their online requirement) * Arable Instruments and Parable Instruments (never updated to v2) * Mog (never updated to v2) From 382892d87c23a7d2f0be3a305f51360ee94d0d28 Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Sun, 10 Nov 2024 16:05:05 -0500 Subject: [PATCH 07/13] Add admiral to LICENSES.md --- docs/LICENSES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 745b9d2..7e17118 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -16,6 +16,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules | 21kHz | MIT | | | 8Mode | BSD-3-Clause | | | Aaron Static | MIT | | +| admiral | MIT | | | alef's bits | GPL-3.0-or-later | | | AlgoritmArte | GPL-3.0-or-later | | | Amalgamated Harmonics | BSD-3-Clause | | From b7704f724144086e64ad950d258514a553d66a1d Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Sun, 10 Nov 2024 17:40:15 -0500 Subject: [PATCH 08/13] Added the admiral plugin. --- plugins/admiral | 1 + 1 file changed, 1 insertion(+) create mode 160000 plugins/admiral diff --git a/plugins/admiral b/plugins/admiral new file mode 160000 index 0000000..2885b72 --- /dev/null +++ b/plugins/admiral @@ -0,0 +1 @@ +Subproject commit 2885b72e1e82b1103eb2cb4db2a226c57c9e5f40 From 310ce19790beea5b157694e4c91156b028149fbd Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Mon, 11 Nov 2024 04:35:20 -0500 Subject: [PATCH 09/13] Added AlliewayAudio_Freebies. --- .gitmodules | 3 +++ README.md | 1 + docs/LICENSES.md | 1 + plugins/AlliewayAudio_Freebies | 1 + plugins/Makefile | 12 ++++++++++++ plugins/plugins.cpp | 17 +++++++++++++++++ 6 files changed, 35 insertions(+) create mode 160000 plugins/AlliewayAudio_Freebies diff --git a/.gitmodules b/.gitmodules index 031eac9..4687ab3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -260,3 +260,6 @@ [submodule "plugins/admiral"] path = plugins/admiral url = https://github.com/wapiflapi/admiral.git +[submodule "plugins/AlliewayAudio_Freebies"] + path = plugins/AlliewayAudio_Freebies + url = https://github.com/AlliewayAudio/AlliewayAudio_Freebies.git diff --git a/README.md b/README.md index 3de00ba..25e0975 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,7 @@ At the moment the following 3rd-party modules are provided: - [Admiral](https://github.com/wapiflapi/admiral) - [alef's bits](https://github.com/alefnull/alefsbits) - [AlgoritmArte](https://github.com/algoritmarte/AlgoritmarteVCVPlugin) +- [AlliewayAudio_Freebies](https://github.com/AlliewayAudio/AlliewayAudio_Freebies) - [Amalgamated Harmonics](https://github.com/jhoar/AmalgamatedHarmonics) - [Animated Circuits](https://github.com/AnimatedCircuits/RackModules) - [Arable Instruments](https://github.com/adbrant/ArableInstruments) diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 7e17118..8a149aa 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -19,6 +19,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules | admiral | MIT | | | alef's bits | GPL-3.0-or-later | | | AlgoritmArte | GPL-3.0-or-later | | +| AlliewayAudio_Freebies | GPL-3.0-or-later | | | Amalgamated Harmonics | BSD-3-Clause | | | Animated Circuits | GPL-3.0-or-later | | | Arable Instruments | GPL-3.0-or-later | | diff --git a/plugins/AlliewayAudio_Freebies b/plugins/AlliewayAudio_Freebies new file mode 160000 index 0000000..4052a08 --- /dev/null +++ b/plugins/AlliewayAudio_Freebies @@ -0,0 +1 @@ +Subproject commit 4052a08e222fb6a8e795a6192bb78079a85cc864 diff --git a/plugins/Makefile b/plugins/Makefile index 3064c77..583fef5 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -338,6 +338,11 @@ ALEFSBITS_CUSTOM = Steps Logic PLUGIN_FILES += $(filter-out Algoritmarte/src/plugin.cpp,$(wildcard Algoritmarte/src/*.cpp)) +# -------------------------------------------------------------- +# AlliewayAudio_Freebies + +PLUGIN_FILES += $(filter-out AlliewayAudio_Freebies/src/plugin.cpp,$(wildcard AlliewayAudio_Freebies/src/*.cpp)) + # -------------------------------------------------------------- # Aaron Static @@ -2155,6 +2160,13 @@ $(BUILD_DIR)/Algoritmarte/%.cpp.o: Algoritmarte/%.cpp $(foreach m,$(ALGORITMARTE_CUSTOM),$(call custom_module_names,$(m),Algoritmarte)) \ -DpluginInstance=pluginInstance__Algoritmarte +$(BUILD_DIR)/AlliewayAudio_Freebies/src/%.cpp.o: AlliewayAudio_Freebies/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(ALLIEWAYAUDIO_FREEBIES_CUSTOM),$(call custom_module_names,$(m),AlliewayAudio_Freebies)) \ + -DpluginInstance=pluginInstance__AlliewayAudio_Freebies + $(BUILD_DIR)/AmalgamatedHarmonics/%.cpp.o: AmalgamatedHarmonics/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index df43654..2e028fd 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -46,6 +46,9 @@ extern Model* modelDivisions; // Algoritmarte #include "Algoritmarte/src/plugin.hpp" +// AlliewayAudio_Freebies +#include "AlliewayAudio_Freebies/src/plugin.hpp" + // AmalgamatedHarmonics #include "AmalgamatedHarmonics/src/AH.hpp" @@ -919,6 +922,7 @@ extern Plugin* pluginInstance__AaronStatic; Plugin* pluginInstance__admiral; Plugin* pluginInstance__alefsbits; Plugin* pluginInstance__Algoritmarte; +Plugin* pluginInstance__AlliewayAudio_Freebies; Plugin* pluginInstance__AmalgamatedHarmonics; Plugin* pluginInstance__ArableInstruments; Plugin* pluginInstance__AnimatedCircuits; @@ -1315,6 +1319,18 @@ static void initStatic__Algoritmarte() } } +static void initStatic__AlliewayAudio_Freebies() +{ + Plugin* const p = new Plugin; + pluginInstance__AlliewayAudio_Freebies = p; + + const StaticPluginLoader spl(p, "AlliewayAudio_Freebies"); + if (spl.ok()) + { + p->addModel(modelChilly_cheese); + } +} + static void initStatic__AmalgamatedHarmonics() { Plugin* const p = new Plugin; @@ -3501,6 +3517,7 @@ void initStaticPlugins() initStatic__admiral(); initStatic__alefsbits(); initStatic__Algoritmarte(); + initStatic__AlliewayAudio_Freebies(); initStatic__AmalgamatedHarmonics(); initStatic__AnimatedCircuits(); initStatic__ArableInstruments(); From bfe91a0dc06e5333e21315a9eaa93d97cc712937 Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Mon, 11 Nov 2024 09:27:26 -0500 Subject: [PATCH 10/13] Added DCBlocker to AlliewayAudio_Freebies --- plugins/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/Makefile b/plugins/Makefile index 583fef5..79fdd26 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -343,6 +343,8 @@ PLUGIN_FILES += $(filter-out Algoritmarte/src/plugin.cpp,$(wildcard Algoritmarte PLUGIN_FILES += $(filter-out AlliewayAudio_Freebies/src/plugin.cpp,$(wildcard AlliewayAudio_Freebies/src/*.cpp)) +ALLIEWAYAUDIO_FREEBIES_CUSTOM = DCBlocker + # -------------------------------------------------------------- # Aaron Static From a270d4b6657fbed8d9e63217433871a9831dc4fc Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Wed, 13 Nov 2024 03:29:32 -0500 Subject: [PATCH 11/13] Added eightfold. --- .gitmodules | 3 +++ README.md | 1 + docs/LICENSES.md | 1 + plugins/Makefile | 14 ++++++++++++++ plugins/eightfold | 1 + plugins/plugins.cpp | 21 +++++++++++++++++++++ 6 files changed, 41 insertions(+) create mode 160000 plugins/eightfold diff --git a/.gitmodules b/.gitmodules index 4687ab3..4cb71d6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -263,3 +263,6 @@ [submodule "plugins/AlliewayAudio_Freebies"] path = plugins/AlliewayAudio_Freebies url = https://github.com/AlliewayAudio/AlliewayAudio_Freebies.git +[submodule "plugins/eightfold"] + path = plugins/eightfold + url = https://github.com/scanner-darkly/eightfold.git diff --git a/README.md b/README.md index 25e0975..95d091f 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,7 @@ At the moment the following 3rd-party modules are provided: - [dBiz](https://github.com/dBiz/dBiz) - [DHE Modules](https://github.com/dhemery/DHE-Modules) - [DrumKit](https://svmodular.com/plugin/vcv/drumkit.html) +- [eightfold](https://github.com/scanner-darkly/eightfold) - [EnigmaCurry](https://github.com/EnigmaCurry/EnigmaCurry-vcv-pack) - [E-Series](https://github.com/VCVRack/ESeries) - [ExpertSleepers Encoders](https://expert-sleepers.co.uk/vcvrack_encoders.html) diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 8a149aa..a7e0b8d 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -41,6 +41,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules | dBiz | GPL-3.0-or-later | | | DHE-Modules | MIT | | | DrumKit | CC0-1.0 | | +| eightfold | GPL-3.0-or-later | | | EnigmaCurry | GPL-3.0-or-later | | | E-Series | GPL-3.0-or-later | | | ExpertSleepers Encoders | MIT | | diff --git a/plugins/Makefile b/plugins/Makefile index 79fdd26..e6b4ccb 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -709,6 +709,13 @@ PLUGIN_FILES += $(wildcard DrumKit/deps/SynthDevKit/src/*.cpp) # modules/types which are present in other plugins DRUMKIT_CUSTOM = ADSR Envelope LowFrequencyOscillator +# -------------------------------------------------------------- +# eightfold + +PLUGIN_FILES += $(filter-out eightfold/src/plugin.cpp,$(wildcard eightfold/src/*.cpp)) +# modules/types which are present in other plugins +EIGHTFOLD_CUSTOM = Comparator comparator + # -------------------------------------------------------------- # EnigmaCurry @@ -2366,6 +2373,13 @@ $(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp -Dinit=init__DrumKit \ -Wno-sign-compare +$(BUILD_DIR)/eightfold/src/%.cpp.o: eightfold/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(EIGHTFOLD_CUSTOM),$(call custom_module_names,$(m),eightfold)) \ + -DpluginInstance=pluginInstance__eightfold + $(BUILD_DIR)/EnigmaCurry/src/%.cpp.o: EnigmaCurry/src/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/eightfold b/plugins/eightfold new file mode 160000 index 0000000..a541c5c --- /dev/null +++ b/plugins/eightfold @@ -0,0 +1 @@ +Subproject commit a541c5cfdc3fb9ad8e4f345470f817eaf576b987 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 2e028fd..1dce69e 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -398,6 +398,9 @@ namespace xycloid { void init(Plugin*); } #include "DrumKit/src/DrumKit.hpp" void setupSamples(); +// eightfold +#include "eightfold/src/plugin.hpp" + // EnigmaCurry #define modelPulse modelEnigmaCurryPulse #include "EnigmaCurry/src/plugin.hpp" @@ -944,6 +947,7 @@ Plugin* pluginInstance__CVfunk; Plugin* pluginInstance__dBiz; Plugin* pluginInstance__DHE; extern Plugin* pluginInstance__DrumKit; +Plugin* pluginInstance__eightfold; Plugin* pluginInstance__EnigmaCurry; Plugin* pluginInstance__ESeries; Plugin* pluginInstance__ExpertSleepersEncoders; @@ -2142,6 +2146,22 @@ static void initStatic__DrumKit() } } +static void initStatic__eightfold() +{ + Plugin* const p = new Plugin; + pluginInstance__eightfold = p; + + const StaticPluginLoader spl(p, "eightfold"); + if (spl.ok()) + { + p->addModel(modelSDOrcasHeartV2); + p->addModel(modelSDFormation); + p->addModel(modelSDLines); + p->addModel(modelSDTransgate); + p->addModel(modelSDComparator); + } +} + static void initStatic__EnigmaCurry() { Plugin* const p = new Plugin; @@ -3539,6 +3559,7 @@ void initStaticPlugins() initStatic__dBiz(); initStatic__DHE(); initStatic__DrumKit(); + initStatic__eightfold(); initStatic__EnigmaCurry(); initStatic__ESeries(); initStatic__ExpertSleepersEncoders(); From b5a001f0c466606642079d02ff09a2fa86bae404 Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:20:47 -0500 Subject: [PATCH 12/13] Add SynthKit. --- .gitmodules | 3 +++ README.md | 1 + docs/LICENSES.md | 1 + plugins/Makefile | 14 ++++++++++++++ plugins/SynthKit | 1 + plugins/plugins.cpp | 29 +++++++++++++++++++++++++++++ 6 files changed, 49 insertions(+) create mode 160000 plugins/SynthKit diff --git a/.gitmodules b/.gitmodules index 4cb71d6..1957360 100644 --- a/.gitmodules +++ b/.gitmodules @@ -266,3 +266,6 @@ [submodule "plugins/eightfold"] path = plugins/eightfold url = https://github.com/scanner-darkly/eightfold.git +[submodule "plugins/SynthKit"] + path = plugins/SynthKit + url = https://github.com/SVModular/SynthKit.git diff --git a/README.md b/README.md index 95d091f..0198077 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,7 @@ At the moment the following 3rd-party modules are provided: - [Starling Via](https://github.com/starlingcode/Via-for-Rack) - [Stoermelder Pack-One](https://github.com/stoermelder/vcvrack-packone) - [Surge XT](https://github.com/surge-synthesizer/surge-rack) +- [SynthKit](https://github.com/SVModular/SynthKit) - [unless_modules](https://gitlab.com/unlessgames/unless_modules) - [Valley](https://github.com/ValleyAudio/ValleyRackFree) - [Voxglitch](https://github.com/clone45/voxglitch) diff --git a/docs/LICENSES.md b/docs/LICENSES.md index a7e0b8d..f658aac 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -90,6 +90,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules | stocaudio | GPL-3.0-or-later | | | Stoermelder Pack-One | GPL-3.0-or-later | | | Surge XT | GPL-3.0-or-later | | +| SynthKit | CC0-1.0 | | | unless_modules | GPL-3.0-or-later | | | Valley | GPL-3.0-or-later | | | Voxglitch | GPL-3.0-or-later | | diff --git a/plugins/Makefile b/plugins/Makefile index e6b4ccb..f0136d5 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1185,6 +1185,13 @@ MINIPLUGIN_FILES += surgext/src/XTModuleWidget.cpp MINIPLUGIN_FILES += surgext/src/XTStyle.cpp MINIPLUGIN_FILES += surgext-helper/surgext-helper.cpp +# -------------------------------------------------------------- +# SynthKit + +PLUGIN_FILES += $(filter-out SynthKit/src/SynthKit.cpp,$(wildcard SynthKit/src/*.cpp)) +PLUGIN_FILES += $(wildcard SynthKit/src/controller/*.cpp) +PLUGIN_FILES += $(wildcard SynthKit/src/view/*.cpp) + # -------------------------------------------------------------- # unless_modules @@ -2824,6 +2831,13 @@ $(BUILD_DIR)/surgext%.cpp.o: surgext%.cpp $(foreach m,$(SURGEXT_CUSTOM),$(call custom_module_names,$(m),surgext)) \ -DpluginInstance=pluginInstance__surgext +$(BUILD_DIR)/SynthKit/src/%.cpp.o: SynthKit/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(SYNTHKIT_CUSTOM),$(call custom_module_names,$(m),SynthKit)) \ + -DpluginInstance=pluginInstance__SynthKit + $(BUILD_DIR)/unless_modules/%.cpp.o: unless_modules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/SynthKit b/plugins/SynthKit new file mode 160000 index 0000000..0d4aba3 --- /dev/null +++ b/plugins/SynthKit @@ -0,0 +1 @@ +Subproject commit 0d4aba35a9a3b0988c3e66172ddfa964ada3dbbe diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 1dce69e..9133b7c 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -874,6 +874,9 @@ void StoermelderSettings::readFromJson() {} void surgext_rack_initialize(); void surgext_rack_update_theme(); +// SynthKit +#include "SynthKit/src/SynthKit.hpp" + // unless_modules #include "unless_modules/src/unless.hpp" @@ -995,6 +998,7 @@ Plugin* pluginInstance__StarlingVia; Plugin* pluginInstance__stocaudio; extern Plugin* pluginInstance__stoermelder_p1; Plugin* pluginInstance__surgext; +Plugin* pluginInstance__SynthKit; Plugin* pluginInstance__unless_modules; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__Voxglitch; @@ -3389,6 +3393,30 @@ static void initStatic__surgext() } } +static void initStatic__SynthKit() +{ + Plugin* const p = new Plugin; + pluginInstance__SynthKit = p; + + const StaticPluginLoader spl(p, "SynthKit"); + if (spl.ok()) + { + p->addModel(modelAddition); + p->addModel(modelSubtraction); + p->addModel(modelAnd); + p->addModel(modelOr); + p->addModel(modelM1x8); + p->addModel(modelM1x8CV); + p->addModel(modelClockDivider); + p->addModel(modelRotatingClockDivider); + p->addModel(modelRotatingClockDivider2); + p->addModel(modelPrimeClockDivider); + p->addModel(modelFibonacciClockDivider); + p->addModel(modelSeq4); + p->addModel(modelSeq8); + } +} + static void initStatic__unless_modules() { Plugin* const p = new Plugin; @@ -3607,6 +3635,7 @@ void initStaticPlugins() initStatic__stocaudio(); initStatic__stoermelder_p1(); initStatic__surgext(); + initStatic__SynthKit(); initStatic__unless_modules(); initStatic__ValleyAudio(); initStatic__Voxglitch(); From 6046eef3483f268a80fc215ff9b98404b365e965 Mon Sep 17 00:00:00 2001 From: rl2939 <60378449+rl2939@users.noreply.github.com> Date: Thu, 14 Nov 2024 19:01:22 -0500 Subject: [PATCH 13/13] Update EnigmaCurry. --- plugins/EnigmaCurry | 2 +- plugins/plugins.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/EnigmaCurry b/plugins/EnigmaCurry index 550b435..dbcd600 160000 --- a/plugins/EnigmaCurry +++ b/plugins/EnigmaCurry @@ -1 +1 @@ -Subproject commit 550b435575c550d829e8cabd97a430e39df836cc +Subproject commit dbcd60007a5bb1cb9be7fa66e1e3589da3405ff6 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 9133b7c..2c78113 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -2179,6 +2179,7 @@ static void initStatic__EnigmaCurry() p->addModel(modelLatch); p->addModel(modelPulse); p->addModel(modelRange); + p->addModel(modelNegativeHarmony); #undef modelPulse } }