From 1278df9dc87397f64aa6015b0e219a5cbe5ba451 Mon Sep 17 00:00:00 2001 From: dreamer <1185977+dromer@users.noreply.github.com> Date: Thu, 24 Feb 2022 22:24:44 +0100 Subject: [PATCH] add CatroModulo (#175) * add CatroModulo * put / in project name --- .gitmodules | 3 +++ README.md | 1 + docs/LICENSES.md | 3 +++ plugins/CatroModulo | 1 + plugins/Makefile | 12 ++++++++++++ plugins/plugins.cpp | 26 ++++++++++++++++++++++++++ 6 files changed, 46 insertions(+) create mode 160000 plugins/CatroModulo diff --git a/.gitmodules b/.gitmodules index eaff476..faae8d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -157,3 +157,6 @@ [submodule "plugins/stocaudio"] path = plugins/stocaudio url = https://github.com/aptrn/stocaudio-modules.git +[submodule "plugins/CatroModulo"] + path = plugins/CatroModulo + url = https://github.com/catronomix/catro-modulo.git diff --git a/README.md b/README.md index 2ea97b8..8bc73d2 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ At the moment the following 3rd-party modules are provided: - Befaco - Bidoo - Bogaudio +- Catro/Modulo - cf - ChowDSP - DrumKit diff --git a/docs/LICENSES.md b/docs/LICENSES.md index db951d6..db9686d 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -25,6 +25,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Befaco | GPL-3.0-or-later | | | Bidoo | GPL-3.0-or-later | | | Bogaudio | GPL-3.0-or-later | | +| Catro/Modulo | BSD-3-Clause | | | cf | BSD-3-Clause | | | ChowDSP | GPL-3.0-or-later | | | DrumKit | CC0-1.0 | | @@ -105,6 +106,8 @@ Below is a list of artwork licenses from plugins | BogaudioModules/fonts/inconsolata*.ttf | OFL-1.1-no-RFN | | | Cardinal/* | CC0-1.0 | | | Cardinal/Miku/Miku.png | CC-BY-NC-3.0 | https://piapro.net/intl/en_for_creators.html | +| CatroModulo/* | BSD-3-Clause | No artwork specific license provided | +| CatroModulo/Segment7Standard.ttf | OFL-1.1-RFN | | | cf/* | BSD-3-Clause | No artwork specific license provided | | cf/DejaVuSansMono.ttf | Bitstream-Vera | | | cf/Segment7Standard.ttf | OFL-1.1-RFN | | diff --git a/plugins/CatroModulo b/plugins/CatroModulo new file mode 160000 index 0000000..80422ac --- /dev/null +++ b/plugins/CatroModulo @@ -0,0 +1 @@ +Subproject commit 80422acf5a0cf5d4e8f14298e7f41ff8fab39543 diff --git a/plugins/Makefile b/plugins/Makefile index 8aad2dd..745ff55 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -429,6 +429,11 @@ PLUGIN_FILES += $(filter-out ChowDSP/src/Credit.cpp,$(wildcard ChowDSP/src/*/*.c PLUGIN_FILES += $(wildcard ChowDSP/src/*/*/*.cpp) PLUGIN_FILES += $(wildcard ChowDSP/lib/r8lib/*.cpp) +# -------------------------------------------------------------- +# CatroModulo + +PLUGIN_FILES += $(wildcard CatroModulo/src/*.cpp) + # -------------------------------------------------------------- # cf @@ -1214,6 +1219,13 @@ $(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp -IBogaudioModules/lib \ -IBogaudioModules/src/dsp +$(BUILD_DIR)/CatroModulo/src/%.cpp.o: CatroModulo/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(CATROMODULO_CUSTOM),$(call custom_module_names,$(m),CatroModulo)) \ + -DpluginInstance=pluginInstance__CatroModulo + $(BUILD_DIR)/cf/src/%.cpp.o: cf/src/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 54fcab0..df8068b 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -267,6 +267,9 @@ extern Model* modelTestVCF; #undef modelVCF #undef modelVCO +// CatroModulo +#include "CatroModulo/src/CatroModulo.hpp" + // cf #include "cf/src/plugin.hpp" @@ -634,6 +637,7 @@ Plugin* pluginInstance__Bacon; Plugin* pluginInstance__Befaco; Plugin* pluginInstance__Bidoo; Plugin* pluginInstance__BogaudioModules; +Plugin* pluginInstance__CatroModulo; Plugin* pluginInstance__cf; Plugin* pluginInstance__ChowDSP; extern Plugin* pluginInstance__DrumKit; @@ -1279,6 +1283,27 @@ static void initStatic__BogaudioModules() } } +static void initStatic__CatroModulo() +{ + Plugin* const p = new Plugin; + pluginInstance__CatroModulo = p; + + const StaticPluginLoader spl(p, "CatroModulo"); + if (spl.ok()) + { + p->addModel(modelCM1Module); + p->addModel(modelCM2Module); + p->addModel(modelCM3Module); + p->addModel(modelCM4Module); + p->addModel(modelCM5Module); + p->addModel(modelCM6Module); + p->addModel(modelCM7Module); + p->addModel(modelCM8Module); + p->addModel(modelCM9Module); + p->addModel(modelCM10Module); + } +} + static void initStatic__cf() { Plugin* const p = new Plugin; @@ -2216,6 +2241,7 @@ void initStaticPlugins() initStatic__Befaco(); initStatic__Bidoo(); initStatic__BogaudioModules(); + initStatic__CatroModulo(); initStatic__cf(); initStatic__ChowDSP(); initStatic__DrumKit();