diff --git a/.gitmodules b/.gitmodules index 83d5014..50ea878 100644 --- a/.gitmodules +++ b/.gitmodules @@ -212,3 +212,6 @@ [submodule "plugins/alefsbits"] path = plugins/alefsbits url = https://github.com/alefnull/alefsbits.git +[submodule "plugins/h4n4-modules"] + path = plugins/h4n4-modules + url = https://github.com/hannakoppelaar/h4n4-modules.git diff --git a/README.md b/README.md index 44e9579..f2efdea 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,7 @@ At the moment the following 3rd-party modules are provided: - Glue the Giant - GoodSheperd - Grande +- H4N4 Modules - Hampton Harmonics - HetrickCV - ihtsyn diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 90976fb..b2f9157 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -43,6 +43,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Glue the Giant | GPL-3.0-or-later | | | GoodSheperd | GPL-3.0-or-later | | | Grande | GPL-3.0-or-later | | +| H4N4 Modules | GPL-3.0-or-later | | | Hampton Harmonics | MIT | | | HetrickCV | CC0-1.0 | | | ihtsyn | GPL-3.0-or-later | | @@ -154,6 +155,7 @@ Below is a list of artwork licenses from plugins | GlueTheGiant/fonts/DSEG7-* | OFL-1.1-RFN | | | GoodSheperd/* | GPL-3.0-or-later | No artwork specific license provided | | GrandeModular/* | CC-BY-NC-ND-4.0 | | +| h4n4-modules/* | GPL-3.0-or-later | No artwork specific license provided | | HamptonHarmonics/* | MIT | No artwork specific license provided | | HamptonHarmonics/PixelOperator.ttf | CC0-1.0 | | | HetrickCV/* | CC0-1.0 | | diff --git a/plugins/Makefile b/plugins/Makefile index 4199e5e..246697c 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -629,6 +629,11 @@ PLUGIN_FILES += $(filter-out GoodSheperd/src/plugin.cpp,$(wildcard GoodSheperd/s PLUGIN_FILES += $(filter-out GrandeModular/src/plugin.cpp,$(wildcard GrandeModular/src/*.cpp)) +# -------------------------------------------------------------- +# H4N4 Modules + +PLUGIN_FILES += $(filter-out h4n4-modules/src/plugin.cpp,$(wildcard h4n4-modules/src/*.cpp)) + # -------------------------------------------------------------- # Hampton Harmonics @@ -1631,7 +1636,7 @@ $(BUILD_DIR)/forsitan-modulare/%.cpp.o: forsitan-modulare/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ - $(foreach m,$(GLUETHEGIANT_CUSTOM),$(call custom_module_names,$(m),forsitan)) \ + $(foreach m,$(FORSITAN_CUSTOM),$(call custom_module_names,$(m),forsitan)) \ -DpluginInstance=pluginInstance__forsitan $(BUILD_DIR)/Fundamental/%.c.o: Fundamental/%.c @@ -1681,6 +1686,13 @@ $(BUILD_DIR)/GrandeModular/%.cpp.o: GrandeModular/%.cpp -Wno-narrowing \ -Wno-self-assign +$(BUILD_DIR)/h4n4-modules/%.cpp.o: h4n4-modules/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(H4N4_CUSTOM),$(call custom_module_names,$(m),H4N4)) \ + -DpluginInstance=pluginInstance__H4N4 + $(BUILD_DIR)/HamptonHarmonics/%.cpp.o: HamptonHarmonics/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/h4n4-modules b/plugins/h4n4-modules new file mode 160000 index 0000000..bb1b158 --- /dev/null +++ b/plugins/h4n4-modules @@ -0,0 +1 @@ +Subproject commit bb1b15870d9dad4dd8a562957f45c2383506795d diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 317336b..c5b8f91 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -349,6 +349,9 @@ void saveGtgPluginDefault(const char*, int) {} // GrandeModular #include "GrandeModular/src/plugin.hpp" +// H4N4 Modules +#include "h4n4-modules/src/plugin.hpp" + // Hampton Harmonics #define modelArp modelHamptonHarmonicsArp #define modelProgress modelHamptonHarmonicsProgress @@ -756,6 +759,7 @@ Plugin* pluginInstance__forsitan; Plugin* pluginInstance__GlueTheGiant; Plugin* pluginInstance__GoodSheperd; Plugin* pluginInstance__GrandeModular; +Plugin* pluginInstance__H4N4; Plugin* pluginInstance__HamptonHarmonics; Plugin* pluginInstance__HetrickCV; extern Plugin* pluginInstance__ImpromptuModular; @@ -1893,6 +1897,18 @@ static void initStatic__GrandeModular() } } +static void initStatic__H4N4() +{ + Plugin* const p = new Plugin; + pluginInstance__H4N4 = p; + + const StaticPluginLoader spl(p, "h4n4-modules"); + if (spl.ok()) + { + p->addModel(modelXenQnt); + } +} + static void initStatic__HamptonHarmonics() { Plugin* const p = new Plugin; @@ -2786,6 +2802,7 @@ void initStaticPlugins() initStatic__GlueTheGiant(); initStatic__GoodSheperd(); initStatic__GrandeModular(); + initStatic__H4N4(); initStatic__HamptonHarmonics(); initStatic__HetrickCV(); initStatic__ImpromptuModular();