diff --git a/.gitmodules b/.gitmodules index 8460a099..34c22644 100644 --- a/.gitmodules +++ b/.gitmodules @@ -260,4 +260,6 @@ [submodule "plugins/admiral"] path = plugins/admiral url = https://github.com/wapiflapi/admiral.git - +[submodule "plugins/NocturnalEncoder"] + path = plugins/NocturnalEncoder + url = https://github.com/djpeterso23662/NocturnalEncoder.git diff --git a/README.md b/README.md index 3de00ba0..4e6e8d3c 100644 --- a/README.md +++ b/README.md @@ -177,6 +177,7 @@ At the moment the following 3rd-party modules are provided: - [MSM](https://github.com/netboy3/MSM-vcvrack-plugin) - [MUS-X](https://github.com/Jojosito/MUS-X) - [Myth](https://github.com/Ahineya/vcv-myth-plugin) +- [Nocturnal Encoder](https://github.com/djpeterso23662/NocturnalEncoder) - [Nonlinear Circuits](https://github.com/mhetrick/nonlinearcircuits) - [Orbits](https://github.com/RareBreeds/Orbits) - [Parable Instruments](https://github.com/adbrant/ArableInstruments) diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 7e171186..72126dd7 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -71,6 +71,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules | MSM | MIT | Repo's [LICENSE-dist.md](https://github.com/netboy3/MSM-vcvrack-plugin/issues/10) includes wrong information | | MUS-X | GPL-3.0-or-later | | | Myth | GPL-3.0-or-later | | +| NocturnalEncoder | BSD-3-Clause | | | Nonlinear Circuits | CC0-1.0 | | | Orbits | GPL-3.0-or-later | | | Parable Instruments | GPL-3.0-or-later | | diff --git a/plugins/Makefile b/plugins/Makefile index 3064c779..2d80e292 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -945,6 +945,11 @@ PLUGIN_FILES += $(filter-out MUS-X/src/plugin.cpp,$(wildcard MUS-X/src/*.cpp)) PLUGIN_FILES += $(filter-out myth-modules/src/plugin.cpp,$(wildcard myth-modules/src/*.cpp)) +# -------------------------------------------------------------- +# Nocturnal Encoder + +PLUGIN_FILES += $(filter-out NocturnalEncoder/src/plugin.cpp,$(wildcard NocturnalEncoder/src/*.cpp)) + # -------------------------------------------------------------- # Nonlinear Circuits @@ -2653,6 +2658,13 @@ $(BUILD_DIR)/myth-modules/%.cpp.o: myth-modules/%.cpp $(foreach m,$(MYTH_MODULES_CUSTOM),$(call custom_module_names,$(m),myth_modules)) \ -DpluginInstance=pluginInstance__myth_modules +$(BUILD_DIR)/NocturnalEncoder/src/%.cpp.o: NocturnalEncoder/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(CF_CUSTOM),$(call custom_module_names,$(m),NocturnalEncoder)) \ + -DpluginInstance=pluginInstance__NocturnalEncoder + $(BUILD_DIR)/nonlinearcircuits/%.cpp.o: nonlinearcircuits/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/NocturnalEncoder b/plugins/NocturnalEncoder new file mode 160000 index 00000000..7008233b --- /dev/null +++ b/plugins/NocturnalEncoder @@ -0,0 +1 @@ +Subproject commit 7008233b9990fa8bc2749857cdb76260313fe7c8 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index b99ea6ba..91121c26 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -774,6 +774,9 @@ extern Model* modelBlankPanel; // myth-modules #include "myth-modules/src/plugin.hpp" +// Nocturnal Encoder +#include "NocturnalEncoder/src/plugin.hpp" + // Nonlinear Circuits #include "nonlinearcircuits/src/NLC.hpp" @@ -970,6 +973,7 @@ extern Plugin* pluginInstance__mscHack; Plugin* pluginInstance__MSM; Plugin* pluginInstance__MUS_X; Plugin* pluginInstance__myth_modules; +Plugin* pluginInstance__NocturnalEncoder; Plugin* pluginInstance__nonlinearcircuits; Plugin* pluginInstance__Orbits; Plugin* pluginInstance__ParableInstruments; @@ -2919,6 +2923,18 @@ static void initStatic__myth_modules() } } +static void initStatic__NocturnalEncoder() +{ + Plugin* const p = new Plugin; + pluginInstance__NocturnalEncoder = p; + + const StaticPluginLoader spl(p, "NocturnalEncoder"); + if (spl.ok()) + { + p->addModel(modelAMDecoder); + p->addModel(modelAMEncoder); + } +} static void initStatic__nonlinearcircuits() { Plugin* const p = new Plugin; @@ -3557,6 +3573,7 @@ void initStaticPlugins() initStatic__MSM(); initStatic__MUS_X(); initStatic__myth_modules(); + initStatic__NocturnalEncoder(); initStatic__nonlinearcircuits(); initStatic__Orbits(); initStatic__ParableInstruments();