From 23f0966be04dac61384d3f91c0c5e86ca39d9d19 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 19 Oct 2021 11:51:01 +0100 Subject: [PATCH] Add ImpromptuModular Signed-off-by: falkTX --- .gitmodules | 3 ++ plugins/ImpromptuModular | 1 + plugins/Makefile | 16 +++++++ plugins/plugins.cpp | 92 ++++++++++++++++++++++++++++++++++++---- plugins/todo.txt | 3 -- 5 files changed, 104 insertions(+), 11 deletions(-) create mode 160000 plugins/ImpromptuModular diff --git a/.gitmodules b/.gitmodules index ecb9291..14e605c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,6 @@ [submodule "plugins/AS"] path = plugins/AS url = https://github.com/AScustomWorks/AS.git +[submodule "plugins/ImpromptuModular"] + path = plugins/ImpromptuModular + url = https://github.com/MarcBoule/ImpromptuModular.git diff --git a/plugins/ImpromptuModular b/plugins/ImpromptuModular new file mode 160000 index 0000000..e7ad79f --- /dev/null +++ b/plugins/ImpromptuModular @@ -0,0 +1 @@ +Subproject commit e7ad79fcded2af13b2682bf530def4f51764867c diff --git a/plugins/Makefile b/plugins/Makefile index fcd6fcb..a8e5485 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -177,6 +177,12 @@ PLUGIN_FILES += Fundamental-workaround/VCA.cpp PLUGIN_FILES += $(filter-out GrandeModular/src/plugin.cpp,$(wildcard GrandeModular/src/*.cpp)) +# -------------------------------------------------------------- +# ImpromptuModular + +PLUGIN_FILES += $(wildcard ImpromptuModular/src/*.cpp) +PLUGIN_FILES += $(wildcard ImpromptuModular/src/comp/*.cpp) + # -------------------------------------------------------------- # JW-Modules @@ -374,6 +380,16 @@ $(BUILD_DIR)/GrandeModular/%.cpp.o: GrandeModular/%.cpp @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__GrandeModular -c -o $@ +$(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__ImpromptuModular -Dinit=init__ImpromptuModular -c -o $@ + +$(BUILD_DIR)/ImpromptuModular/src/comp/Components.cpp.o: ImpromptuModular/src/comp/Components.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__ImpromptuModular -DsaveDarkAsDefault=ImpromptuModularIgnore1 -DloadDarkAsDefault=ImpromptuModularIgonre2 -c -o $@ + $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 1b6e038..b20e4b3 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -172,11 +172,53 @@ // GrandeModular #include "GrandeModular/src/plugin.hpp" +// ImpromptuModular +/* NOTE too much noise in original include, do this a different way +// #include "ImpromptuModular/src/ImpromptuModular.hpp" +*/ +extern Model *modelBigButtonSeq; +extern Model *modelBigButtonSeq2; +extern Model *modelChordKey; +extern Model *modelChordKeyExpander; +extern Model *modelClocked; +extern Model *modelClockedExpander; +extern Model *modelClkd; +extern Model *modelCvPad; +extern Model *modelFoundry; +extern Model *modelFoundryExpander; +extern Model *modelFourView; +extern Model *modelGateSeq64; +extern Model *modelGateSeq64Expander; +extern Model *modelHotkey; +extern Model *modelPart; +extern Model *modelPhraseSeq16; +extern Model *modelPhraseSeq32; +extern Model *modelPhraseSeqExpander; +extern Model *modelProbKey; +// extern Model *modelProbKeyExpander; +extern Model *modelSemiModularSynth; +extern Model *modelTact; +extern Model *modelTact1; +extern Model *modelTactG; +extern Model *modelTwelveKey; +extern Model *modelWriteSeq32; +extern Model *modelWriteSeq64; +extern Model *modelBlankPanel; + // JW-Modules #include "JW-Modules/src/JWModules.hpp" // rackwindows #include "rackwindows/src/plugin.hpp" + +// ValleyAudio +/* does not build against v2 +#include "ValleyAudio/src/Valley.hpp" +*/ + +// ZetaCarinaeModules +#include "ZetaCarinaeModules/src/plugin.hpp" + // stuff that reads config files, we dont want that int loadConsoleType() { return 0; } int loadDirectOutMode() { return 0; } @@ -187,14 +229,7 @@ void saveDarkAsDefault(bool) {} void saveDirectOutMode(bool) {} void saveHighQualityAsDefault(bool) {} -// ValleyAudio -/* does not build against v2 -#include "ValleyAudio/src/Valley.hpp" -*/ - -// ZetaCarinaeModules -#include "ZetaCarinaeModules/src/plugin.hpp" - +// plugin instances Plugin* pluginInstance__AnimatedCircuits; Plugin* pluginInstance__AS; Plugin* pluginInstance__AudibleInstruments; @@ -205,6 +240,7 @@ Plugin* pluginInstance__Cardinal; Plugin* pluginInstance__ESeries; Plugin* pluginInstance__Fundamental; Plugin* pluginInstance__GrandeModular; +extern Plugin* pluginInstance__ImpromptuModular; Plugin* pluginInstance__JW; Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__ValleyAudio; @@ -773,6 +809,45 @@ static void initStatic__GrandeModular() } } +static void initStatic__ImpromptuModular() +{ + Plugin* const p = new Plugin; + pluginInstance__ImpromptuModular = p; + + const StaticPluginLoader spl(p, "ImpromptuModular"); + if (spl.ok()) + { + p->addModel(modelBigButtonSeq); + p->addModel(modelBigButtonSeq2); + p->addModel(modelChordKey); + p->addModel(modelChordKeyExpander); + p->addModel(modelClocked); + p->addModel(modelClockedExpander); + p->addModel(modelClkd); + p->addModel(modelCvPad); + p->addModel(modelFoundry); + p->addModel(modelFoundryExpander); + p->addModel(modelFourView); + p->addModel(modelGateSeq64); + p->addModel(modelGateSeq64Expander); + p->addModel(modelHotkey); + p->addModel(modelPart); + p->addModel(modelPhraseSeq16); + p->addModel(modelPhraseSeq32); + p->addModel(modelPhraseSeqExpander); + p->addModel(modelProbKey); + // p->addModel(modelProbKeyExpander); + p->addModel(modelSemiModularSynth); + p->addModel(modelTact); + p->addModel(modelTact1); + p->addModel(modelTactG); + p->addModel(modelTwelveKey); + p->addModel(modelWriteSeq32); + p->addModel(modelWriteSeq64); + p->addModel(modelBlankPanel); + } +} + static void initStatic__JW() { Plugin* const p = new Plugin; @@ -896,6 +971,7 @@ void initStaticPlugins() initStatic__ESeries(); initStatic__Fundamental(); initStatic__GrandeModular(); + initStatic__ImpromptuModular(); initStatic__JW(); initStatic__rackwindows(); /* does not build against v2 diff --git a/plugins/todo.txt b/plugins/todo.txt index a194efd..9141c43 100644 --- a/plugins/todo.txt +++ b/plugins/todo.txt @@ -10,9 +10,6 @@ Valley Grayscale 74754.0 (not opensource?) -ImpromptuModular 62537.0 -https://github.com/MarcBoule/ImpromptuModular - VultModulesFree 61804.0 (not opensource?) AmalgamatedHarmonics 59071.0