diff --git a/.gitmodules b/.gitmodules index 771ebb0..61cde09 100644 --- a/.gitmodules +++ b/.gitmodules @@ -187,3 +187,6 @@ [submodule "plugins/Fundamental"] path = plugins/Fundamental url = https://github.com/CardinalModules/Fundamental.git +[submodule "plugins/unless_modules"] + path = plugins/unless_modules + url = https://gitlab.com/unlessgames/unless_modules diff --git a/README.md b/README.md index 3f4d1df..66df12a 100644 --- a/README.md +++ b/README.md @@ -159,6 +159,7 @@ At the moment the following 3rd-party modules are provided: - repelzen - Sonus Modular - stocaudio +- unless_modules - Valley - Voxglitch - ZetaCarinae diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 31c969a..117b4c0 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -65,6 +65,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | repelzen | GPL-3.0-or-later | | | Sonus Modular | GPL-3.0-or-later | | | stocaudio | GPL-3.0-or-later | | +| unless_modules | GPL-3.0-or-later | | | Valley | GPL-3.0-or-later | | | Voxglitch | GPL-3.0-or-later | | | ZetaCarinae | GPL-3.0-or-later | | @@ -183,6 +184,9 @@ Below is a list of artwork licenses from plugins | repelzen/* | CC-BY-SA-4.0 | | | 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 | +| unless_modules/* | CC BY-NC-ND 4.0 | | +| unless_modules/font/CuteFont-Regular.ttf| OFL-1.1 | | +| unless_modules/font/Terminus.ttf | GPL-2.0 | | | 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 e0dcbff..7bf218d 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -762,6 +762,12 @@ PLUGIN_FILES += $(filter-out sonusmodular/src/sonusmodular.cpp,$(wildcard sonusm PLUGIN_FILES += $(filter-out stocaudio/src/plugin.cpp,$(wildcard stocaudio/src/*.cpp)) +# -------------------------------------------------------------- + +# unless_modules + +PLUGIN_FILES += $(filter-out unless_modules/src/unless.cpp,$(wildcard unless_modules/src/*.cpp)) + # -------------------------------------------------------------- # ValleyAudio @@ -1689,6 +1695,13 @@ $(BUILD_DIR)/stocaudio/%.cpp.o: stocaudio/%.cpp $(foreach m,$(STOCAUDIO_CUSTOM),$(call custom_module_names,$(m),stocaudio)) \ -DpluginInstance=pluginInstance__stocaudio +$(BUILD_DIR)/unless_modules/%.cpp.o: unless_modules/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(UNLESS_MODULES_CUSTOM),$(call custom_module_names,$(m),unless_modules)) \ + -DpluginInstance=pluginInstance__unless_modules + $(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 2cc5433..d758390 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -647,6 +647,10 @@ extern Model* modelBlankPanel; // stocaudio #include "stocaudio/src/plugin.hpp" +// unless_modules +#include "unless_modules/src/unless.hpp" + + // ValleyAudio #include "ValleyAudio/src/Valley.hpp" @@ -735,6 +739,7 @@ Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__stocaudio; +Plugin* pluginInstance__unless_modules; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__Voxglitch; Plugin* pluginInstance__ZetaCarinaeModules; @@ -2377,6 +2382,29 @@ static void initStatic__stocaudio() p->addModel(modelSpread); } } +static void initStatic__unless_modules() +{ + Plugin* const p = new Plugin; + pluginInstance__unless_modules = p; + + const StaticPluginLoader spl(p, "unless_modules"); + if (spl.ok()) + { + // unless_modules::init_theme(); + // theme = _less::Theme(); + p->addModel(modelPiong); + p->addModel(modelChainkov); + p->addModel(modelAtoms); + p->addModel(modelCantor); + p->addModel(modelRoom); + p->addModel(modelSnake); + p->addModel(modelTowers); + p->addModel(modelPianoid); + p->addModel(modelPremuter); + p->addModel(modelAvoider); + } +} + static void initStatic__ValleyAudio() { @@ -2531,6 +2559,7 @@ void initStaticPlugins() initStatic__repelzen(); initStatic__sonusmodular(); initStatic__stocaudio(); + initStatic__unless_modules(); initStatic__ValleyAudio(); initStatic__Voxglitch(); initStatic__ZetaCarinaeModules(); diff --git a/plugins/unless_modules b/plugins/unless_modules new file mode 160000 index 0000000..3f895c7 --- /dev/null +++ b/plugins/unless_modules @@ -0,0 +1 @@ +Subproject commit 3f895c7663e3e54c4e30c406c56d420ea407133e