From 5a7a9b21f4b3024a5df9ddebede90979e62c5938 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 10 Nov 2021 14:17:35 +0000 Subject: [PATCH 1/2] Add mscHack plugin modules (needs upstream v2 fixes) --- .gitmodules | 3 +++ plugins/Makefile | 13 +++++++++ plugins/mscHack | 1 + plugins/plugins.cpp | 64 +++++++++++++++++++++++++++++++++++++++++++++ plugins/todo.txt | 16 +++++++++--- 5 files changed, 93 insertions(+), 4 deletions(-) create mode 160000 plugins/mscHack diff --git a/.gitmodules b/.gitmodules index 8135585..b35365b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,3 +67,6 @@ [submodule "carla"] path = carla url = https://github.com/falkTX/Carla.git +[submodule "plugins/mscHack"] + path = plugins/mscHack + url = https://github.com/mschack/VCV-Rack-Plugins.git diff --git a/plugins/Makefile b/plugins/Makefile index 68695ed..d02cc7f 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -418,6 +418,11 @@ PLUGIN_FILES += $(wildcard MindMeldModular/src/Utilities/*.cpp) # modules/types which are present in other plugins MINDMELD_CUSTOM = printNote +# -------------------------------------------------------------- +# mscHack + +PLUGIN_FILES += $(wildcard mscHack/src/*.cpp) + # -------------------------------------------------------------- # rackwindows @@ -875,6 +880,14 @@ $(BUILD_DIR)/MindMeldModular/MindMeldModular.cpp.o: MindMeldModular/src/MindMeld -DpluginInstance=pluginInstance__MindMeld \ -Dinit=init__MindMeld +$(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(MINDMELD_CUSTOM),$(call custom_module_names,$(m),JW)) \ + -DthePlugin=pluginInstance__mscHack \ + -Dinit=init__mscHack + $(BUILD_DIR)/rackwindows/%.cpp.o: rackwindows/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/mscHack b/plugins/mscHack new file mode 160000 index 0000000..231fecd --- /dev/null +++ b/plugins/mscHack @@ -0,0 +1 @@ +Subproject commit 231fecd7a3986952c3c42b00ed884524095ed542 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 27c0c45..ea88a66 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -249,6 +249,34 @@ extern Model *modelBassMaster; extern Model *modelBassMasterJr; extern Model *modelShapeMaster; +// mscHack +/* NOTE too much noise in original include, do this a different way +// #include "mscHack/src/mscHack.hpp" +*/ +extern Model *modelCompressor; +extern Model *modelSynthDrums; +extern Model *modelSEQ_6x32x16; +extern Model *modelMasterClockx8; +extern Model *modelMasterClockx4; +extern Model *modelSEQ_Envelope_8; +extern Model *modelSeq_Triad2; +extern Model *modelARP700; +extern Model *modelMix_24_4_4; +extern Model *modelMix_16_4_4; +extern Model *modelMix_9_3_4; +extern Model *modelMix_4_0_4; +extern Model *modelASAF8; +extern Model *modelPingPong; +extern Model *modelStepDelay; +extern Model *modelOsc_3Ch; +extern Model *modelDronez; +extern Model *modelMorze; +extern Model *modelWindz; +extern Model *modelLorenz; +extern Model *modelAlienz; +extern Model *modelOSC_WaveMorph_3; +extern Model *modelMaude_221; + // rackwindows #include "rackwindows/src/plugin.hpp" @@ -288,6 +316,7 @@ Plugin* pluginInstance__GrandeModular; extern Plugin* pluginInstance__ImpromptuModular; Plugin* pluginInstance__JW; extern Plugin* pluginInstance__MindMeld; +extern Plugin* pluginInstance__mscHack; Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__ZetaCarinaeModules; @@ -1048,6 +1077,40 @@ static void initStatic__MindMeld() } } +static void initStatic__mscHack() +{ + Plugin* const p = new Plugin; + pluginInstance__mscHack = p; + + const StaticPluginLoader spl(p, "mscHack"); + if (spl.ok()) + { + p->addModel(modelCompressor); + p->addModel(modelSynthDrums); + p->addModel(modelSEQ_6x32x16); + p->addModel(modelMasterClockx4); + //p->addModel(modelMasterClockx8); + p->addModel(modelSEQ_Envelope_8); + p->addModel(modelSeq_Triad2); + p->addModel(modelARP700); + p->addModel(modelMix_4_0_4); + p->addModel(modelMix_9_3_4); + p->addModel(modelMix_16_4_4); + p->addModel(modelMix_24_4_4); + p->addModel(modelASAF8); + p->addModel(modelPingPong); + p->addModel(modelStepDelay); + p->addModel(modelOsc_3Ch); + p->addModel(modelDronez); + p->addModel(modelMorze); + p->addModel(modelWindz); + p->addModel(modelLorenz); + p->addModel(modelAlienz); + p->addModel(modelOSC_WaveMorph_3); + p->addModel(modelMaude_221); + } +} + static void initStatic__rackwindows() { Plugin* const p = new Plugin; @@ -1137,6 +1200,7 @@ void initStaticPlugins() initStatic__ImpromptuModular(); initStatic__JW(); initStatic__MindMeld(); + initStatic__mscHack(); initStatic__rackwindows(); initStatic__ValleyAudio(); initStatic__ZetaCarinaeModules(); diff --git a/plugins/todo.txt b/plugins/todo.txt index f4d2e06..2a9b67e 100644 --- a/plugins/todo.txt +++ b/plugins/todo.txt @@ -8,9 +8,6 @@ VultModulesFree 61804.0 (not opensource?) NYSTHI 58494.0 (not opensource?) -DrumKit 58468.0 -https://github.com/SVModular/DrumKit - ML_modules 55847.0 https://github.com/martin-lueders/ML_modules/ @@ -18,16 +15,27 @@ FrozenWasteland 53690.0 https://github.com/almostEric/FrozenWasteland/ ArableInstruments 48756.0 +https://github.com/adbrant/ArableInstruments/ + squinkylabs-plug1 48682.0 +https://github.com/squinkylabs/SquinkyVCV + SonusModular 45245.0 -LindenbergResearch 43959.0 +https://gitlab.com/sonusdept/sonusmodular + +LindenbergResearch 43959.0 (not opensource?) Geodesics 42761.0 https://github.com/MarcBoule/Geodesics mscHack 42316.0 +https://github.com/mschack/VCV-Rack-Plugins/ + BaconMusic 42095.0 +https://github.com/baconpaul/BaconPlugs/ + HetrickCV 42077.0 +https://github.com/mhetrick/hetrickcv Alikins 41798.0 https://github.com/alikins/Alikins-rack-plugins From 0a8daea3ca7cf3378881ccf7599661cfa7c5532d Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 12 Nov 2021 18:17:33 +0000 Subject: [PATCH 2/2] Use the mscHack fork for v2 compat --- plugins/mscHack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mscHack b/plugins/mscHack index 231fecd..c2f2249 160000 --- a/plugins/mscHack +++ b/plugins/mscHack @@ -1 +1 @@ -Subproject commit 231fecd7a3986952c3c42b00ed884524095ed542 +Subproject commit c2f224941ca286c4630519c61e271ba7778402b3