diff --git a/.gitmodules b/.gitmodules index 028e6d8..9544b04 100644 --- a/.gitmodules +++ b/.gitmodules @@ -221,3 +221,6 @@ [submodule "plugins/RebelTech"] path = plugins/RebelTech url = https://github.com/hemmer/rebel-tech-vcv.git +[submodule "plugins/stoermelder-packone"] + path = plugins/stoermelder-packone + url = https://github.com/stoermelder/vcvrack-packone.git diff --git a/plugins/Makefile b/plugins/Makefile index c37314e..bf26738 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -902,7 +902,19 @@ PLUGIN_FILES += $(filter-out sonusmodular/src/sonusmodular.cpp,$(wildcard sonusm PLUGIN_FILES += $(filter-out stocaudio/src/plugin.cpp,$(wildcard stocaudio/src/*.cpp)) # -------------------------------------------------------------- +# stoermelder-packone +STOERMELDER_PACKONE_IGNORED = AudioInterface64 MidiCat MidiKey MidiMon MidiPlug MidiStep Strip StripBay StripPp + +# FIXME +STOERMELDER_PACKONE_IGNORED += Raw + +PLUGIN_FILES += $(filter-out $(STOERMELDER_PACKONE_IGNORED:%=stoermelder-packone/src/%.cpp),$(wildcard stoermelder-packone/src/*.cpp stoermelder-packone/src/mb/*.cpp)) + +# modules/types which are present in other plugins +STOERMELDER_PACKONE_CUSTOM = + +# -------------------------------------------------------------- # unless_modules PLUGIN_FILES += $(filter-out unless_modules/src/unless.cpp,$(wildcard unless_modules/src/*.cpp)) @@ -1773,8 +1785,7 @@ $(BUILD_DIR)/ImpromptuModular/src/ImpromptuModular.cpp.o: ImpromptuModular/src/I $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(IMPROMPTUMODULAR_CUSTOM),$(call custom_module_names,$(m),ImpromptuModular)) \ -DpluginInstance=pluginInstance__ImpromptuModular \ - -Dinit=init__ImpromptuModular \ - -UBUILDING_PLUGIN_MODULES + -Dinit=init__ImpromptuModular $(BUILD_DIR)/ImpromptuModular%.cpp.o: ImpromptuModular%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @@ -2011,6 +2022,14 @@ $(BUILD_DIR)/sonusmodular/%.cpp.o: sonusmodular/%.cpp $(foreach m,$(SONUSMODULAR_CUSTOM),$(call custom_module_names,$(m),sonusmodular)) \ -DpluginInstance=pluginInstance__sonusmodular +$(BUILD_DIR)/stoermelder-packone/%.cpp.o: stoermelder-packone/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(STOERMELDER_PACKONE_CUSTOM),$(call custom_module_names,$(m),stoermelder_packone)) \ + -DpluginInstance=pluginInstance__stoermelder_packone \ + -Dinit=init__stoermelder_packone + $(BUILD_DIR)/stocaudio/%.cpp.o: stocaudio/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 1ce711b..fe3ada9 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -715,6 +715,21 @@ void addThemeMenuItems(Menu*, ModuleTheme*) {} // stocaudio #include "stocaudio/src/plugin.hpp" +// stoermelder-packone +#include "stoermelder-packone/src/plugin.hpp" +Model* modelAudioInterface64; +Model* modelMidiCat; +Model* modelMidiCatMem; +Model* modelMidiCatCtx; +Model* modelMidiKey; +Model* modelMidiMon; +Model* modelMidiPlug; +Model* modelMidiStep; +Model* modelRaw; +Model* modelStrip; +Model* modelStripBay4; +Model* modelStripPp; + // unless_modules #include "unless_modules/src/unless.hpp" @@ -826,6 +841,7 @@ Plugin* pluginInstance__RebelTech; Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__stocaudio; +extern Plugin* pluginInstance__stoermelder_packone; Plugin* pluginInstance__unless_modules; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__Voxglitch; @@ -2591,6 +2607,7 @@ static void initStatic__PathSet() p->addModel(modelIceTray); p->addModel(modelAstroVibe); p->addModel(modelGlassPane); + p->addModel(modelPlusPane); p->addModel(modelNudge); p->addModel(modelOneShot); } @@ -2744,6 +2761,74 @@ static void initStatic__stocaudio() } } +static void initStatic__stoermelder_packone() +{ + Plugin* const p = new Plugin; + pluginInstance__stoermelder_packone = p; + + const StaticPluginLoader spl(p, "stoermelder-packone"); + if (spl.ok()) + { + p->addModel(modelCVMap); + p->addModel(modelCVMapCtx); + p->addModel(modelCVMapMicro); + p->addModel(modelCVPam); + p->addModel(modelRotorA); + p->addModel(modelReMoveLite); + p->addModel(modelBolt); + p->addModel(modelInfix); + p->addModel(modelInfixMicro); + p->addModel(modelEightFace); + p->addModel(modelEightFaceX2); + p->addModel(modelSipo); + p->addModel(modelFourRounds); + p->addModel(modelArena); + p->addModel(modelMaze); + p->addModel(modelHive); + p->addModel(modelIntermix); + p->addModel(modelIntermixGate); + p->addModel(modelIntermixEnv); + p->addModel(modelIntermixFade); + p->addModel(modelSail); + p->addModel(modelPile); + p->addModel(modelPilePoly); + p->addModel(modelMirror); + p->addModel(modelAffix); + p->addModel(modelAffixMicro); + p->addModel(modelGrip); + p->addModel(modelGlue); + p->addModel(modelGoto); + p->addModel(modelStroke); + p->addModel(modelSpin); + p->addModel(modelTransit); + p->addModel(modelTransitEx); + p->addModel(modelX4); + p->addModel(modelMacro); + p->addModel(modelOrbit); + p->addModel(modelEightFaceMk2); + p->addModel(modelEightFaceMk2Ex); + p->addModel(modelDirt); + p->addModel(modelMb); + p->addModel(modelMe); + + // NOTE disabled in Cardinal due to curl usage + // p->addModel(modelRaw); + spl.removeModule("Raw"); + + spl.removeModule("AudioInterface64"); + spl.removeModule("MidiCat"); + spl.removeModule("MidiCatEx"); + spl.removeModule("MidiCatCtx"); + spl.removeModule("MidiKey"); + spl.removeModule("MidiMon"); + spl.removeModule("MidiPlug"); + spl.removeModule("MidiStep"); + spl.removeModule("Strip"); + spl.removeModule("StripBay4"); + spl.removeModule("StripPp"); + } +} + static void initStatic__unless_modules() { Plugin* const p = new Plugin; @@ -2942,6 +3027,7 @@ void initStaticPlugins() initStatic__repelzen(); initStatic__sonusmodular(); initStatic__stocaudio(); + initStatic__stoermelder_packone(), initStatic__unless_modules(); initStatic__ValleyAudio(); initStatic__Voxglitch(); diff --git a/plugins/stoermelder-packone b/plugins/stoermelder-packone new file mode 160000 index 0000000..9b9c203 --- /dev/null +++ b/plugins/stoermelder-packone @@ -0,0 +1 @@ +Subproject commit 9b9c203cbd8b58b3dc95dafc355b43c1fce6dc11