@@ -157,3 +157,6 @@ | |||||
[submodule "plugins/stocaudio"] | [submodule "plugins/stocaudio"] | ||||
path = plugins/stocaudio | path = plugins/stocaudio | ||||
url = https://github.com/aptrn/stocaudio-modules.git | url = https://github.com/aptrn/stocaudio-modules.git | ||||
[submodule "plugins/CatroModulo"] | |||||
path = plugins/CatroModulo | |||||
url = https://github.com/catronomix/catro-modulo.git |
@@ -114,6 +114,7 @@ At the moment the following 3rd-party modules are provided: | |||||
- Befaco | - Befaco | ||||
- Bidoo | - Bidoo | ||||
- Bogaudio | - Bogaudio | ||||
- Catro/Modulo | |||||
- cf | - cf | ||||
- ChowDSP | - ChowDSP | ||||
- DrumKit | - DrumKit | ||||
@@ -25,6 +25,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | |||||
| Befaco | GPL-3.0-or-later | | | | Befaco | GPL-3.0-or-later | | | ||||
| Bidoo | GPL-3.0-or-later | | | | Bidoo | GPL-3.0-or-later | | | ||||
| Bogaudio | GPL-3.0-or-later | | | | Bogaudio | GPL-3.0-or-later | | | ||||
| Catro/Modulo | BSD-3-Clause | | | |||||
| cf | BSD-3-Clause | | | | cf | BSD-3-Clause | | | ||||
| ChowDSP | GPL-3.0-or-later | | | | ChowDSP | GPL-3.0-or-later | | | ||||
| DrumKit | CC0-1.0 | | | | 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 | | | | BogaudioModules/fonts/inconsolata*.ttf | OFL-1.1-no-RFN | | | ||||
| Cardinal/* | CC0-1.0 | | | | Cardinal/* | CC0-1.0 | | | ||||
| Cardinal/Miku/Miku.png | CC-BY-NC-3.0 | https://piapro.net/intl/en_for_creators.html | | | 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/* | BSD-3-Clause | No artwork specific license provided | | ||||
| cf/DejaVuSansMono.ttf | Bitstream-Vera | | | | cf/DejaVuSansMono.ttf | Bitstream-Vera | | | ||||
| cf/Segment7Standard.ttf | OFL-1.1-RFN | | | | cf/Segment7Standard.ttf | OFL-1.1-RFN | | | ||||
@@ -0,0 +1 @@ | |||||
Subproject commit 80422acf5a0cf5d4e8f14298e7f41ff8fab39543 |
@@ -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/src/*/*/*.cpp) | ||||
PLUGIN_FILES += $(wildcard ChowDSP/lib/r8lib/*.cpp) | PLUGIN_FILES += $(wildcard ChowDSP/lib/r8lib/*.cpp) | ||||
# -------------------------------------------------------------- | |||||
# CatroModulo | |||||
PLUGIN_FILES += $(wildcard CatroModulo/src/*.cpp) | |||||
# -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
# cf | # cf | ||||
@@ -1214,6 +1219,13 @@ $(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp | |||||
-IBogaudioModules/lib \ | -IBogaudioModules/lib \ | ||||
-IBogaudioModules/src/dsp | -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 | $(BUILD_DIR)/cf/src/%.cpp.o: cf/src/%.cpp | ||||
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" | ||||
@echo "Compiling $<" | @echo "Compiling $<" | ||||
@@ -267,6 +267,9 @@ extern Model* modelTestVCF; | |||||
#undef modelVCF | #undef modelVCF | ||||
#undef modelVCO | #undef modelVCO | ||||
// CatroModulo | |||||
#include "CatroModulo/src/CatroModulo.hpp" | |||||
// cf | // cf | ||||
#include "cf/src/plugin.hpp" | #include "cf/src/plugin.hpp" | ||||
@@ -634,6 +637,7 @@ Plugin* pluginInstance__Bacon; | |||||
Plugin* pluginInstance__Befaco; | Plugin* pluginInstance__Befaco; | ||||
Plugin* pluginInstance__Bidoo; | Plugin* pluginInstance__Bidoo; | ||||
Plugin* pluginInstance__BogaudioModules; | Plugin* pluginInstance__BogaudioModules; | ||||
Plugin* pluginInstance__CatroModulo; | |||||
Plugin* pluginInstance__cf; | Plugin* pluginInstance__cf; | ||||
Plugin* pluginInstance__ChowDSP; | Plugin* pluginInstance__ChowDSP; | ||||
extern Plugin* pluginInstance__DrumKit; | 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() | static void initStatic__cf() | ||||
{ | { | ||||
Plugin* const p = new Plugin; | Plugin* const p = new Plugin; | ||||
@@ -2216,6 +2241,7 @@ void initStaticPlugins() | |||||
initStatic__Befaco(); | initStatic__Befaco(); | ||||
initStatic__Bidoo(); | initStatic__Bidoo(); | ||||
initStatic__BogaudioModules(); | initStatic__BogaudioModules(); | ||||
initStatic__CatroModulo(); | |||||
initStatic__cf(); | initStatic__cf(); | ||||
initStatic__ChowDSP(); | initStatic__ChowDSP(); | ||||
initStatic__DrumKit(); | initStatic__DrumKit(); | ||||