diff --git a/.gitmodules b/.gitmodules index faae8d0..196cbe0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -160,3 +160,6 @@ [submodule "plugins/CatroModulo"] path = plugins/CatroModulo url = https://github.com/catronomix/catro-modulo.git +[submodule "plugins/AaronStatic"] + path = plugins/AaronStatic + url = https://github.com/aaronstatic/AaronStatic_modules.git diff --git a/README.md b/README.md index 8bc73d2..a8b3fbf 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,7 @@ At the moment the following 3rd-party modules are provided: - 21kHz - 8Mode +- Aaron Static - Amalgamated Harmonics - Animated Circuits - Aria Salvatrice diff --git a/docs/LICENSES.md b/docs/LICENSES.md index db9686d..63cf108 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -15,6 +15,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Rack | GPL-3.0-or-later | The actual Rack code, internal dependencies are compatible with GPLv3+ | | 21kHz | MIT | | | 8Mode | BSD-3-Clause | | +| Aaron Static | MIT | | | Amalgamated Harmonics | BSD-3-Clause | | | Animated Circuits | GPL-3.0-or-later | | | Aria Salvatrice | GPL-3.0-or-later | | @@ -79,6 +80,8 @@ Below is a list of artwork licenses from plugins |-----------------------------------------|------------------|------------------| | 21kHz | MIT | No artwork specific license provided | | 8Mode | BSD-3-Clause | No artwork specific license provided | +| AaronStatic/* | MIT | No artwork specific license provided | +| AaronStatic/fonts/PixelOperator.ttf | CC0-1.0 | | | AmalgamatedHarmonics/* | BSD-3-Clause | No artwork specific license provided | | AmalgamatedHarmonics/DSEG*.ttf | OFL-1.1-RFN | | | AmalgamatedHarmonics/Roboto*.ttf | Apache-2.0 | | diff --git a/plugins/AaronStatic b/plugins/AaronStatic new file mode 160000 index 0000000..4ace0a1 --- /dev/null +++ b/plugins/AaronStatic @@ -0,0 +1 @@ +Subproject commit 4ace0a1789c577ee4eb12dc03da5271f80598d62 diff --git a/plugins/Makefile b/plugins/Makefile index c757eac..b7849fc 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -233,6 +233,11 @@ PLUGIN_FILES += $(filter-out 21kHz/src/21kHz.cpp,$(wildcard 21kHz/src/*.cpp)) PLUGIN_FILES += $(wildcard 8Mode/src/*.cpp) +# -------------------------------------------------------------- +# Aaron Static + +PLUGIN_FILES += $(wildcard AaronStatic/src/*.cpp) + # -------------------------------------------------------------- # AmalgamatedHarmonics @@ -1119,6 +1124,13 @@ $(BUILD_DIR)/8Mode/%.cpp.o: 8Mode/%.cpp $(foreach m,$(8MODE_CUSTOM),$(call custom_module_names,$(m),8Mode)) \ -DpluginInstance=pluginInstance__8Mode +$(BUILD_DIR)/AaronStatic/%.cpp.o: AaronStatic/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(AARONSTATIC_CUSTOM),$(call custom_module_names,$(m),AaronStatic)) \ + -DpluginInstance=pluginInstance__AaronStatic + $(BUILD_DIR)/AmalgamatedHarmonics/%.cpp.o: AmalgamatedHarmonics/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index e2a621e..9609e0a 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -30,6 +30,9 @@ // 8Mode #include "8Mode/src/8mode.hpp" +// Aaron Static +#include "AaronStatic/src/plugin.hpp" + // AmalgamatedHarmonics #include "AmalgamatedHarmonics/src/AH.hpp" @@ -627,6 +630,7 @@ Plugin* pluginInstance__Cardinal; #ifndef NOPLUGINS Plugin* pluginInstance__21kHz; Plugin* pluginInstance__8Mode; +Plugin* pluginInstance__AaronStatic; Plugin* pluginInstance__AmalgamatedHarmonics; Plugin* pluginInstance__AnimatedCircuits; Plugin* pluginInstance__Aria; @@ -843,6 +847,21 @@ static void initStatic__8Mode() } } +static void initStatic__AaronStatic() +{ + Plugin* const p = new Plugin; + pluginInstance__AaronStatic = p; + + const StaticPluginLoader spl(p, "AaronStatic"); + if (spl.ok()) + { + p->addModel(modelChordCV); + p->addModel(modelScaleCV); + p->addModel(modelRandomNoteCV); + p->addModel(modelDiatonicCV); + } +} + static void initStatic__AmalgamatedHarmonics() { Plugin* const p = new Plugin; @@ -2233,6 +2252,7 @@ void initStaticPlugins() #ifndef NOPLUGINS initStatic__21kHz(); initStatic__8Mode(); + initStatic__AaronStatic(); initStatic__AmalgamatedHarmonics(); initStatic__AnimatedCircuits(); initStatic__Aria();