diff --git a/.gitmodules b/.gitmodules index 75badf8..eaff476 100644 --- a/.gitmodules +++ b/.gitmodules @@ -154,3 +154,6 @@ [submodule "plugins/Orbits"] path = plugins/Orbits url = git@github.com:RareBreeds/Orbits.git +[submodule "plugins/stocaudio"] + path = plugins/stocaudio + url = https://github.com/aptrn/stocaudio-modules.git diff --git a/README.md b/README.md index f0730c6..2ea97b8 100644 --- a/README.md +++ b/README.md @@ -143,6 +143,7 @@ At the moment the following 3rd-party modules are provided: - rackwindows - repelzen - Sonus Modular +- stocaudio - Substation Opensource - Valley - ZetaCarinae diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 791056b..db951d6 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -55,6 +55,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | repelzen | GPL-3.0-or-later | | | Substation Opensource | BSD-3-Clause-Attribution | Need to check full compatibility with GPLv3+ | | Sonus Modular | GPL-3.0-or-later | | +| stocaudio | GPL-3.0-or-later | | | Valley | GPL-3.0-or-later | | | ZetaCarinae | GPL-3.0-or-later | | | ZZC | GPL-3.0-or-later | | @@ -154,6 +155,7 @@ Below is a list of artwork licenses from plugins | repelzen/* | CC-BY-SA-4.0 | | | substation-opensource/* | BSD-3-Clause-Attribution | No artwork specific license provided | | sonusmodular/* | GPL-3.0-or-later | [Same license as source code](https://gitlab.com/sonusdept/sonusmodular/-/issues/14) | +| stocaudio/* | GPL-3.0-or-later | No artwork specific license provided | | ValleyAudio/* | GPL-3.0-or-later | [Same license as source code](https://github.com/ValleyAudio/ValleyRackFree/issues/73) | | ValleyAudio/din1451alt.ttf | CC-BY-3.0-DE | | | ValleyAudio/DSEG14Classic-*.ttf | OFL-1.1-RFN | | diff --git a/plugins/Makefile b/plugins/Makefile index c84ce10..abd8489 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -667,6 +667,11 @@ REPELZEN_CUSTOM = Blank Mixer Werner tanh_pade PLUGIN_FILES += $(filter-out sonusmodular/src/sonusmodular,$(wildcard sonusmodular/src/*.cpp)) +# -------------------------------------------------------------- +# stocaudio + +PLUGIN_FILES += $(wildcard stocaudio/src/*.cpp) + # -------------------------------------------------------------- # Substation (Open source release) @@ -1503,6 +1508,13 @@ $(BUILD_DIR)/sonusmodular/%.cpp.o: sonusmodular/%.cpp $(foreach m,$(SONUSMODULAR_CUSTOM),$(call custom_module_names,$(m),sonusmodular)) \ -DpluginInstance=pluginInstance__sonusmodular +$(BUILD_DIR)/stocaudio/%.cpp.o: stocaudio/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(STOCAUDIO_CUSTOM),$(call custom_module_names,$(m),stocaudio)) \ + -DpluginInstance=pluginInstance__stocaudio + $(BUILD_DIR)/substation-%.cpp.o: substation-%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 2754356..54fcab0 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -569,6 +569,9 @@ extern Model* modelMaude_221; // sonusmodular #include "sonusmodular/src/sonusmodular.hpp" +// stocaudio +#include "stocaudio/src/plugin.hpp" + // substation /* NOTE too much noise in original include, do this a different way // "substation-opensource/src/_plugin.hpp" @@ -663,6 +666,7 @@ Plugin* pluginInstance__Prism; Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sonusmodular; +Plugin* pluginInstance__stocaudio; Plugin* pluginInstance__substation; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__ZetaCarinaeModules; @@ -2099,6 +2103,20 @@ static void initStatic__sonusmodular() } } +static void initStatic__stocaudio() +{ + Plugin* const p = new Plugin; + pluginInstance__stocaudio = p; + + const StaticPluginLoader spl(p, "stocaudio"); + if (spl.ok()) + { + p->addModel(modelPolyturing); + p->addModel(modelPolydelay); + p->addModel(modelSpread); + } +} + static void initStatic__substation() { Plugin* const p = new Plugin; @@ -2230,6 +2248,7 @@ void initStaticPlugins() initStatic__rackwindows(); initStatic__repelzen(); initStatic__sonusmodular(); + initStatic__stocaudio(); initStatic__substation(); initStatic__ValleyAudio(); initStatic__ZetaCarinaeModules(); diff --git a/plugins/stocaudio b/plugins/stocaudio new file mode 160000 index 0000000..ed5c85b --- /dev/null +++ b/plugins/stocaudio @@ -0,0 +1 @@ +Subproject commit ed5c85b0d9391c37f4ec4d9de4ef8aa30d94bcd6