diff --git a/.gitmodules b/.gitmodules index ecb4c84..e020097 100644 --- a/.gitmodules +++ b/.gitmodules @@ -136,3 +136,6 @@ [submodule "plugins/MockbaModular"] path = plugins/MockbaModular url = https://github.com/MockbaTheBorg/MockbaModular.git +[submodule "plugins/8Mode"] + path = plugins/8Mode + url = https://github.com/8Mode/8Mode-VCV_Modules.git diff --git a/README.md b/README.md index 1975ba2..d9d07d8 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ An overview of the included code and linked submodules can be seen [here](docs/L At the moment the following 3rd-party modules are provided: - 21kHz +- 8Mode - Amalgamated Harmonics - Animated Circuits - Aria Salvatrice diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 73b2497..5e939ef 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -14,6 +14,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | DPF | ISC, GPL-2.0-or-later | Used as the plugin framework, VST2 binary GPLv2+ licensed | | Rack | GPL-3.0-or-later | The actual Rack code, internal dependencies are compatible with GPLv3+ | | 21kHz | MIT | | +| 8Mode | BSD-3-Clause | | | Amalgamated Harmonics | BSD-3-Clause | | | Animated Circuits | GPL-3.0-or-later | | | Aria Salvatrice | GPL-3.0-or-later | | @@ -70,6 +71,7 @@ Below is a list of artwork licenses from plugins | Name | License(s) | Additional notes | |-----------------------------------------|------------------|------------------| | 21kHz | MIT | No artwork specific license provided | +| 8Mode | BSD-3-Clause | No artwork specific license provided | | 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/8Mode b/plugins/8Mode new file mode 160000 index 0000000..fe5a642 --- /dev/null +++ b/plugins/8Mode @@ -0,0 +1 @@ +Subproject commit fe5a642ee0a455e882e105f422cf85f7e83fd31f diff --git a/plugins/Makefile b/plugins/Makefile index bd53a03..f6422cd 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -228,6 +228,11 @@ ifneq ($(NOPLUGINS),true) PLUGIN_FILES += $(filter-out 21kHz/src/21kHz.cpp,$(wildcard 21kHz/src/*.cpp)) +# -------------------------------------------------------------- +# 8Mode + +PLUGIN_FILES += $(wildcard 8Mode/src/*.cpp) + # -------------------------------------------------------------- # AmalgamatedHarmonics @@ -1060,6 +1065,13 @@ $(BUILD_DIR)/21kHz/%.cpp.o: 21kHz/%.cpp $(foreach m,$(21KHZ_CUSTOM),$(call custom_module_names,$(m),21kHz)) \ -DpluginInstance=pluginInstance__21kHz +$(BUILD_DIR)/8Mode/%.cpp.o: 8Mode/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(8MODE_CUSTOM),$(call custom_module_names,$(m),8Mode)) \ + -DpluginInstance=pluginInstance__8Mode + $(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 178cd52..07b0634 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -27,6 +27,9 @@ // 21kHz #include "21kHz/src/21kHz.hpp" +// 8Mode +#include "8Mode/src/8mode.hpp" + // AmalgamatedHarmonics #include "AmalgamatedHarmonics/src/AH.hpp" @@ -563,6 +566,7 @@ void saveHighQualityAsDefault(bool) {} Plugin* pluginInstance__Cardinal; #ifndef NOPLUGINS Plugin* pluginInstance__21kHz; +Plugin* pluginInstance__8Mode; Plugin* pluginInstance__AmalgamatedHarmonics; Plugin* pluginInstance__AnimatedCircuits; Plugin* pluginInstance__Aria; @@ -760,6 +764,18 @@ static void initStatic__21kHz() } } +static void initStatic__8Mode() +{ + Plugin* const p = new Plugin; + pluginInstance__8Mode = p; + + const StaticPluginLoader spl(p, "8Mode"); + if (spl.ok()) + { + p->addModel(modelsoftSN); + } +} + static void initStatic__AmalgamatedHarmonics() { Plugin* const p = new Plugin; @@ -2006,6 +2022,7 @@ void initStaticPlugins() initStatic__Cardinal(); #ifndef NOPLUGINS initStatic__21kHz(); + initStatic__8Mode(); initStatic__AmalgamatedHarmonics(); initStatic__AnimatedCircuits(); initStatic__Aria();