diff --git a/.gitmodules b/.gitmodules index d1071ce..2347ddd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -127,3 +127,6 @@ [submodule "plugins/LomasModules"] path = plugins/LomasModules url = https://github.com/LomasModules/LomasModules.git +[submodule "plugins/ExpertSleepers-Encoders"] + path = plugins/ExpertSleepers-Encoders + url = https://github.com/expertsleepersltd/vcvrack-encoders.git diff --git a/README.md b/README.md index c94e12d..21016fc 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,8 @@ At the moment the following 3rd-party modules are provided: - ChowDSP - DrumKit - E-Series +- ExpertSleepers Encoders +- Extratone - Fehler Fabrik - Fundamental - Glue the Giant @@ -106,12 +108,13 @@ At the moment the following 3rd-party modules are provided: - MindMeld - Mog - mscHack +- Prism - Rackwindows - repelzen - Sonus Modular - Valley -- ZZC - ZetaCarinae +- ZZC Additionally Cardinal provides its own modules for DAW/Host automation, time position and internal plugin hosting. diff --git a/doc/LICENSES.md b/doc/LICENSES.md index 1831646..1fe64e9 100644 --- a/doc/LICENSES.md +++ b/doc/LICENSES.md @@ -8,48 +8,49 @@ the more restrictive of the **code licenses** will apply to the final binary. Bellow follows a list of all code licenses used in Cardinal and linked submodules. -| Name | License(s) | Additional notes | -|-----------------------|-----------------------|------------------| -| Carla | GPL-2.0-or-later | Used as plugin host within Cardinal| -| 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 | | -| AS | MIT | | -| Amalgamated Harmonics | BSD-3-Clause | | -| Animated Circuits | GPL-3.0-or-later | | -| Aria Salvatrice | GPL-3.0-or-later | | -| Atelier | GPL-3.0-or-later | | -| Audible Instruments | GPL-3.0-or-later | | -| Bacon Music | GPL-3.0-or-later | | -| Befaco | GPL-3.0-or-later | | -| Bidoo | GPL-3.0-or-later | | -| Bogaudio | GPL-3.0-or-later | | -| ChowDSP | GPL-3.0-or-later | | -| 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 | | -| Grande | GPL-3.0-or-later | | -| HetrickCV | CC0-1.0 | | -| Impromptu | GPL-3.0-or-later | | -| JW-Modules | BSD-3-Clause | | -| LifeFormModular | MIT | | -| Little Utils | MIT | | -| Lomas Modules | GPL-3.0-or-later | | -| Lyrae Modules | GPL-3.0-or-later | | -| MindMeld | GPL-3.0-or-later | | -| Mog | CC0-1.0 | | -| mscHack | BSD-3-Clause | | -| Prism | BSD-3-Clause | | -| Rackwindows | MIT | | -| repelzen | GPL-3.0-or-later | | -| Sonus Modular | GPL-3.0-or-later | | -| Valley | GPL-3.0-or-later | | -| ZetaCarinae | GPL-3.0-or-later | | -| ZZC | GPL-3.0-or-later | | +| Name | License(s) | Additional notes | +|-------------------------|-----------------------|------------------| +| Carla | GPL-2.0-or-later | Used as plugin host within Cardinal | +| 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 | | +| AS | MIT | | +| Amalgamated Harmonics | BSD-3-Clause | | +| Animated Circuits | GPL-3.0-or-later | | +| Aria Salvatrice | GPL-3.0-or-later | | +| Atelier | GPL-3.0-or-later | | +| Audible Instruments | GPL-3.0-or-later | | +| Bacon Music | GPL-3.0-or-later | | +| Befaco | GPL-3.0-or-later | | +| Bidoo | GPL-3.0-or-later | | +| Bogaudio | GPL-3.0-or-later | | +| cf | BSD-3-Clause | | +| ChowDSP | GPL-3.0-or-later | | +| DrumKit | CC0-1.0 | | +| E-Series | GPL-3.0-or-later | | +| ExpertSleepers Encoders | MIT | | +| 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 | | +| Grande | GPL-3.0-or-later | | +| HetrickCV | CC0-1.0 | | +| Impromptu | GPL-3.0-or-later | | +| JW-Modules | BSD-3-Clause | | +| LifeFormModular | MIT | | +| Little Utils | MIT | | +| Lomas Modules | GPL-3.0-or-later | | +| Lyrae Modules | GPL-3.0-or-later | | +| MindMeld | GPL-3.0-or-later | | +| Mog | CC0-1.0 | | +| mscHack | BSD-3-Clause | | +| Prism | BSD-3-Clause | | +| Rackwindows | MIT | | +| repelzen | GPL-3.0-or-later | | +| Sonus Modular | GPL-3.0-or-later | | +| Valley | GPL-3.0-or-later | | +| ZetaCarinae | GPL-3.0-or-later | | +| ZZC | GPL-3.0-or-later | | ## ARTWORK / PANEL LICENSES @@ -97,12 +98,13 @@ Below is a list of artwork licenses from plugins | BogaudioModules/* | CC-BY-SA-4.0 | | | Cardinal/* | CC0-1.0 | | | Cardinal/Miku/Miku.png | CC-BY-NC-3.0 | https://piapro.net/intl/en_for_creators.html | +| ExpertSleepers-Encoders/* | MIT | No artwork specific license provided | | LittleUtils/* | MIT | No artwork specific license provided | -| LittleUtils/ComponentLibrary/* | CC-BY-NC-4.0 | | | LyraeModules/* | CC-BY-NC-SA-4.0 | | | ZetaCarinaeModules/* | GPL-3.0-or-later | No artwork specific license provided | TODO: Everything after Cardinal +TODO: LittleUtils/fonts/* ### Rack diff --git a/plugins/ExpertSleepers-Encoders b/plugins/ExpertSleepers-Encoders new file mode 160000 index 0000000..df096a6 --- /dev/null +++ b/plugins/ExpertSleepers-Encoders @@ -0,0 +1 @@ +Subproject commit df096a635fe8d3ea86a1e6451a55e45ccee5b83d diff --git a/plugins/Makefile b/plugins/Makefile index 067a624..22cbe05 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -425,6 +425,11 @@ DRUMKIT_CUSTOM = ADSR Envelope LowFrequencyOscillator PLUGIN_FILES += ESeries/src/E340.cpp +# -------------------------------------------------------------- +# ExpertSleepers-Encoders + +PLUGIN_FILES += $(filter-out ExpertSleepers-Encoders/src/Encoders.cpp,$(wildcard ExpertSleepers-Encoders/src/*.cpp)) + # -------------------------------------------------------------- # Extratone @@ -1030,6 +1035,13 @@ $(BUILD_DIR)/ESeries/%.cpp.o: ESeries/%.cpp $(foreach m,$(ESERIES_CUSTOM),$(call custom_module_names,$(m),ESeries)) \ -DpluginInstance=pluginInstance__ESeries +$(BUILD_DIR)/ExpertSleepers-Encoders/src/%.cpp.o: ExpertSleepers-Encoders/src/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(EXPERTSLEEPERS_ENCODERS_CUSTOM),$(call custom_module_names,$(m),ExpertSleepersEncoders)) \ + -DpluginInstance=pluginInstance__ExpertSleepersEncoders + $(BUILD_DIR)/Extratone/src/%.cpp.o: Extratone/src/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index d9a6c32..b77525a 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -256,6 +256,9 @@ void setupSamples(); // ESeries #include "ESeries/src/plugin.hpp" +// ExpertSleepers-Encoders +#include "ExpertSleepers-Encoders/src/Encoders.hpp" + // Extratone #include "Extratone/src/plugin.hpp" @@ -509,6 +512,7 @@ Plugin* pluginInstance__cf; Plugin* pluginInstance__ChowDSP; extern Plugin* pluginInstance__DrumKit; Plugin* pluginInstance__ESeries; +Plugin* pluginInstance__ExpertSleepersEncoders; Plugin* pluginInstance__Extratone; Plugin* pluginInstance__FehlerFabrik; Plugin* pluginInstance__Fundamental; @@ -1262,6 +1266,23 @@ static void initStatic__ESeries() } } +static void initStatic__ExpertSleepersEncoders() +{ + Plugin* const p = new Plugin; + pluginInstance__ExpertSleepersEncoders = p; + + const StaticPluginLoader spl(p, "ExpertSleepers-Encoders"); + if (spl.ok()) + { + p->addModel(model8GT); + p->addModel(model8CV); + p->addModel(modelES40); + p->addModel(modelES5); + p->addModel(modelSMUX); + p->addModel(modelCalibrator); + } +} + static void initStatic__Extratone() { Plugin* const p = new Plugin; @@ -1870,6 +1891,7 @@ void initStaticPlugins() initStatic__ChowDSP(); initStatic__DrumKit(); initStatic__ESeries(); + initStatic__ExpertSleepersEncoders(); initStatic__Extratone(); initStatic__FehlerFabrik(); initStatic__Fundamental(); diff --git a/plugins/res/ExpertSleepers-Encoders b/plugins/res/ExpertSleepers-Encoders new file mode 120000 index 0000000..658e4d0 --- /dev/null +++ b/plugins/res/ExpertSleepers-Encoders @@ -0,0 +1 @@ +../ExpertSleepers-Encoders/res \ No newline at end of file