diff --git a/.gitmodules b/.gitmodules index fadc093..558fe2b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -260,6 +260,18 @@ [submodule "plugins/admiral"] path = plugins/admiral url = https://github.com/wapiflapi/admiral.git +<<<<<<< HEAD [submodule "plugins/eightfold"] path = plugins/eightfold url = https://github.com/scanner-darkly/eightfold.git +======= +[submodule "plugins/Venom"] + path = plugins/Venom + url = https://github.com/DaveBenham/VenomModules +[submodule "plugins/countmodula"] + path = plugins/countmodula + url = https://github.com/countmodula/VCVRackPlugins.git +[submodule "plugins/dbRackModules"] + path = plugins/dbRackModules + url = https://github.com/docb/dbRackModules.git +>>>>>>> ac289ab (init dbRackModules) diff --git a/plugins/Makefile b/plugins/Makefile index e641c00..e40f6ad 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -689,6 +689,25 @@ PLUGIN_FILES += $(filter-out dBiz/src/plugin.cpp,$(wildcard dBiz/src/*.cpp)) DBIZ_CUSTOM = Chord DarkDefaultItem Divider FourSeq FourSeqWidget OrangeLight VCA4 Wavefolder darkPanelID lightPanelID DBIZ_CUSTOM_PER_FILE = LERP MultiFilter Oscillator calcOutput sineOsc subBank +# -------------------------------------------------------------- +# dbRackModules + +PLUGIN_FILES += $(filter-out dbRackModules/src/plugin.cpp dbRackModules/src/Drums.cpp,$(wildcard dbRackModules/src/*.cpp)) + +# modules/types which are present in other plugins +DBRACKMODULES_CUSTOM = SKF X4 MVerb Osc3 + +PLUGIN_FILES += dbRackModules/Gamma/src/arr.cpp +PLUGIN_FILES += dbRackModules/Gamma/src/Domain.cpp +PLUGIN_FILES += dbRackModules/Gamma/src/scl.cpp +PLUGIN_FILES += dbRackModules/Gamma/src/DFT.cpp +PLUGIN_FILES += dbRackModules/Gamma/src/FFT_fftpack.cpp +PLUGIN_FILES += dbRackModules/Gamma/src/fftpack++1.cpp +PLUGIN_FILES += dbRackModules/Gamma/src/fftpack++2.cpp + +RESOURCE_FILES += $(wildcard dbRackModules/images/*.png) +RESOURCE_FILES += $(wildcard dbRackModules/presets) + # -------------------------------------------------------------- # DHE-Modules @@ -2342,6 +2361,16 @@ $(BUILD_DIR)/dBiz/src/%.cpp.o: dBiz/src/%.cpp $(foreach m,$(DBIZ_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),dBiz_$(shell basename -- $*))) \ -DpluginInstance=pluginInstance__dBiz +$(BUILD_DIR)/dbRackModules/%.cpp.o: dbRackModules/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(DBRACKMODULES_CUSTOM),$(call custom_module_names,$(m),dbRackModules)) \ + -DpluginInstance=pluginInstance__dbRackModules \ + -DSTDIO_OVERRIDE=dbRackModules \ + -IdbRackModules/Gamma \ + -Wno-unused-but-set-variable + $(BUILD_DIR)/DHE-Modules/src/%.cpp.o: DHE-Modules/src/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/dbRackModules b/plugins/dbRackModules new file mode 160000 index 0000000..52626d3 --- /dev/null +++ b/plugins/dbRackModules @@ -0,0 +1 @@ +Subproject commit 52626d36b1efef7a709138bd70ceaed5445623e1 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index e012e94..d87d7c2 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -375,6 +375,97 @@ extern Model* modelTestVCF; #undef modelFourSeq #undef modelVCA4 +// dbRackModules +#define modelSKF modeldbRackModulesSKF +#define modelX4 modeldbRackModulesX4 +#define modelMVerb modeldbRackModulesMVerb +#define modelOsc3 modeldbRackModulesOsc3 +extern Model* modelGeneticTerrain; +extern Model* modelGeneticSuperTerrain; +extern Model* modelDCBlock; +extern Model* modelRndHvs3; +extern Model* modelJTScaler; +extern Model* modelAddSynth; +extern Model* modelRndH; +extern Model* modelRndC; +extern Model* modelGenScale; +extern Model* modelJTKeys; +extern Model* modelHopa; +extern Model* modelFrac; +extern Model* modelHexSeq; +extern Model* modelInterface; +extern Model* modelHexSeqP; +extern Model* modelMVerb; +extern Model* modelPShift; +extern Model* modelFLA; +extern Model* modelFLL; +extern Model* modelGendy; +extern Model* modelRtrig; +extern Model* modelSTrig; +extern Model* modelRSC; +extern Model* modelPad; +extern Model* modelRndG; +extern Model* modelPlotter; +extern Model* modelSuperLFO; +extern Model* modelHexSeqExp; +extern Model* modelPad2; +extern Model* modelPHSR; +extern Model* modelPhS; +extern Model* modelSPL; +extern Model* modelPhO; +extern Model* modelFaders; +extern Model* modelYC; +extern Model* modelPLC; +extern Model* modelMPad2; +extern Model* modelPHSR2; +extern Model* modelEVA; +extern Model* modelRatio; +extern Model* modelCSOSC; +extern Model* modelBWF; +extern Model* modelPRB; +extern Model* modelOsc2; +extern Model* modelRndH2; +extern Model* modelOFS; +extern Model* modelOFS3; +extern Model* modelOsc1; +extern Model* modelOsc3; +extern Model* modelOsc4; +extern Model* modelOsc5; +extern Model* modelL4P; +extern Model* modelSKF; +extern Model* modelSPF; +extern Model* modelUSVF; +extern Model* modelAP; +extern Model* modelWS; +extern Model* modelAUX; +extern Model* modelCHBY; +extern Model* modelCLP; +extern Model* modelLWF; +extern Model* modelDRM; +extern Model* modelCWS; +extern Model* modelSWF; +extern Model* modelOsc6; +/*extern Model* modelDrums;*/ +extern Model* modelPPD; +extern Model* modelOsc7; +extern Model* modelOsc8; +extern Model* modelOsc9; +extern Model* modelFS6; +extern Model* modelPulsar; +extern Model* modelOscA1; +extern Model* modelOscS; +extern Model* modelOscP; +extern Model* modelX16; +extern Model* modelX8; +extern Model* modelX4; +extern Model* modelX6; +extern Model* modelCVS; +extern Model* modelDTrig; +#undef modelSKF +#undef modelX4 +#undef modelMVerb +#undef modelOsc3 + // DHEModules // NOTE very unique way of handling init, needs special handling namespace dhe { @@ -960,6 +1051,7 @@ Plugin* pluginInstance__ChowDSP; Plugin* pluginInstance__Computerscare; Plugin* pluginInstance__CVfunk; Plugin* pluginInstance__dBiz; +Plugin* pluginInstance__dbRackModules; Plugin* pluginInstance__DHE; Plugin* pluginInstance__eightfold; Plugin* pluginInstance__EnigmaCurry; @@ -2125,6 +2217,110 @@ static void initStatic__dBiz() } } +static void initStatic__dbRackModules() +{ + Plugin* const p = new Plugin; + pluginInstance__dbRackModules = p; + + const StaticPluginLoader spl(p, "dbRackModules"); + if (spl.ok()) + { +#define modelSKF modeldbRackModulesSKF +#define modelX4 modeldbRackModulesX4 +#define modelMVerb modeldbRackModulesMVerb +#define modelOsc3 modeldbRackModulesOsc3 + p->addModel(modelGeneticTerrain); + p->addModel(modelGeneticSuperTerrain); + p->addModel(modelDCBlock); + p->addModel(modelRndHvs3); + p->addModel(modelJTScaler); + p->addModel(modelAddSynth); + p->addModel(modelRndH); + p->addModel(modelRndC); + p->addModel(modelGenScale); + p->addModel(modelJTKeys); + p->addModel(modelHopa); + p->addModel(modelFrac); + p->addModel(modelHexSeq); + p->addModel(modelInterface); + p->addModel(modelHexSeqP); + p->addModel(modelMVerb); + p->addModel(modelPShift); + p->addModel(modelFLA); + p->addModel(modelFLL); + p->addModel(modelGendy); + p->addModel(modelRtrig); + p->addModel(modelSTrig); + p->addModel(modelRSC); + p->addModel(modelPad); + p->addModel(modelRndG); + p->addModel(modelPlotter); + p->addModel(modelSuperLFO); + p->addModel(modelHexSeqExp); + p->addModel(modelPad2); + p->addModel(modelPHSR); + p->addModel(modelPhS); + p->addModel(modelSPL); + p->addModel(modelPhO); + p->addModel(modelFaders); + p->addModel(modelYC); + p->addModel(modelPLC); + p->addModel(modelMPad2); + p->addModel(modelPHSR2); + p->addModel(modelEVA); + p->addModel(modelCSOSC); + p->addModel(modelRatio); + p->addModel(modelBWF); + p->addModel(modelPRB); + p->addModel(modelOsc2); + p->addModel(modelRndH2); + p->addModel(modelOFS); + p->addModel(modelOFS3); + p->addModel(modelOsc1); + p->addModel(modelOsc3); + p->addModel(modelOsc4); + p->addModel(modelOsc5); + p->addModel(modelSKF); + p->addModel(modelSPF); + p->addModel(modelL4P); + p->addModel(modelUSVF); + p->addModel(modelAP); + p->addModel(modelAUX); + p->addModel(modelWS); + p->addModel(modelCHBY); + p->addModel(modelCLP); + p->addModel(modelLWF); + p->addModel(modelDRM); + p->addModel(modelCWS); + p->addModel(modelSWF); + p->addModel(modelOsc6); + /*p->addModel(modelDrums);*/ + p->addModel(modelPPD); + p->addModel(modelOsc7); + p->addModel(modelOsc8); + p->addModel(modelOsc9); + p->addModel(modelFS6); + p->addModel(modelPulsar); + p->addModel(modelOscA1); + p->addModel(modelOscS); + p->addModel(modelOscP); + p->addModel(modelX16); + p->addModel(modelX8); + p->addModel(modelX4); + p->addModel(modelX6); + p->addModel(modelCVS); + p->addModel(modelDTrig); + + // Defined in manifest but not in plugin + spl.removeModule("Drums"); + +#undef modelSKF +#undef modelX4 +#undef modelMVerb +#undef modelOsc3 + } +} + static void initStatic__DHE() { Plugin* const p = new Plugin; @@ -3617,6 +3813,7 @@ void initStaticPlugins() initStatic__Computerscare(); initStatic__CVfunk(); initStatic__dBiz(); + initStatic__dbRackModules(); initStatic__DHE(); initStatic__eightfold(); initStatic__EnigmaCurry();