diff --git a/.gitmodules b/.gitmodules index 2db72a0..cd38bd3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -112,3 +112,6 @@ [submodule "plugins/Prism"] path = plugins/Prism url = https://github.com/SteveRussell33/Prism.git +[submodule "plugins/Extratone"] + path = plugins/Extratone + url = https://github.com/EaterOfSheep/Extratone.git diff --git a/doc/LICENSES.md b/doc/LICENSES.md index 2638471..9bda2ca 100644 --- a/doc/LICENSES.md +++ b/doc/LICENSES.md @@ -27,6 +27,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | cf | BSD-3-Clause | | | DrumKit | CC0-1.0 | | | E-Series | GPL-3.0-or-later | | +| Extratone | GPL-3.0-or-later | | | Fehler Fabrik | GPL-3.0-or-later | | | Fundamental | GPL-3.0-or-later | | | Glue the Giant | GPL-3.0-or-later | | diff --git a/plugins/Extratone b/plugins/Extratone new file mode 160000 index 0000000..3d327f6 --- /dev/null +++ b/plugins/Extratone @@ -0,0 +1 @@ +Subproject commit 3d327f6bacf41eb18bec7e63c61531685ee799de diff --git a/plugins/Makefile b/plugins/Makefile index a3965f6..ccb28f6 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -409,6 +409,11 @@ DRUMKIT_CUSTOM = ADSR Envelope LowFrequencyOscillator PLUGIN_FILES += ESeries/src/E340.cpp +# -------------------------------------------------------------- +# Extratone + +PLUGIN_FILES += $(filter-out Extratone/src/plugin.cpp,$(wildcard Extratone/src/*.cpp)) + # -------------------------------------------------------------- # FehlerFabrik @@ -984,6 +989,13 @@ $(BUILD_DIR)/ESeries/%.cpp.o: ESeries/%.cpp $(foreach m,$(ESERIES_CUSTOM),$(call custom_module_names,$(m),ESeries)) \ -DpluginInstance=pluginInstance__ESeries +$(BUILD_DIR)/Extratone/src/%.cpp.o: Extratone/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(EXTRATONE_CUSTOM),$(call custom_module_names,$(m),Extratone)) \ + -DpluginInstance=pluginInstance__Extratone + $(BUILD_DIR)/FehlerFabrik/%.cpp.o: FehlerFabrik/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 86d7400..e588675 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -253,6 +253,9 @@ void setupSamples(); // ESeries #include "ESeries/src/plugin.hpp" +// Extratone +#include "Extratone/src/plugin.hpp" + // FehlerFabrik #include "FehlerFabrik/src/plugin.hpp" @@ -480,6 +483,7 @@ Plugin* pluginInstance__cf; Plugin* pluginInstance__ChowDSP; extern Plugin* pluginInstance__DrumKit; Plugin* pluginInstance__ESeries; +Plugin* pluginInstance__Extratone; Plugin* pluginInstance__FehlerFabrik; Plugin* pluginInstance__Fundamental; Plugin* pluginInstance__GrandeModular; @@ -1211,6 +1215,30 @@ static void initStatic__ESeries() } } +static void initStatic__Extratone() +{ + Plugin* const p = new Plugin; + pluginInstance__Extratone = p; + + const StaticPluginLoader spl(p, "Extratone"); + if (spl.ok()) + { + p->addModel(modelModulo); + p->addModel(modelMesoglea); + p->addModel(modelMesoglea2); + p->addModel(modelOpabinia); + p->addModel(modelSplitterburst); + p->addModel(modelPuzzlebox); + p->addModel(modelDarwinism); + // p->addModel(modelHalluciMemory); + p->addModel(modelIchneumonid); + p->addModel(modelMeganeura); + p->addModel(modelPureneura); + p->addModel(modelMesohyl); + p->addModel(modelXtrtnBlank); + } +} + static void initStatic__FehlerFabrik() { Plugin* const p = new Plugin; @@ -1757,6 +1785,7 @@ void initStaticPlugins() initStatic__ChowDSP(); initStatic__DrumKit(); initStatic__ESeries(); + initStatic__Extratone(); initStatic__FehlerFabrik(); initStatic__Fundamental(); initStatic__GlueTheGiant(); diff --git a/plugins/res/Extratone b/plugins/res/Extratone new file mode 120000 index 0000000..a368b25 --- /dev/null +++ b/plugins/res/Extratone @@ -0,0 +1 @@ +../Extratone/res/ \ No newline at end of file