CVfunk (#618)

* Add CVfunk plugin Added CVfunk plugin * added CVfunk plugin added CVfunk plugin * removed CVfunk removed CVfunk * Added CVfunk as submodule Added CVfunk as submodule * Update .gitmodules remove duplicate CVfunk removed extra CVfunk. my mistake * remove extra spaces removed extra spaces I put in by accident. * Update Makefile * Define modelSteps redefine modelSteps so it doesn't conflict with other modules * Fixerd defining of overlapping module name Fixed definition of overlapping module name * Fixed custom name declaration Fixed custom name declatation * Update Makefile Fixed module name reference to CVfunk instead of cf. * Add CVfunk to readme Added CVfunk * Update LICENSES.md Added CVfunk * Update LICENSES.md added CVfunk artwork license * Update CVfunk update submodule linker, decreased CPU consumption to optimize better for Cardinal
DISTRHO · Mar 8, 2024 · 7f1a48d · 7f1a48d
1 parent 4b3b458
commit 7f1a48d
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -233,3 +233,6 @@
 [submodule "plugins/DHE-Modules"]
 	path = plugins/DHE-Modules
 	url = https://github.com/dhemery/DHE-Modules.git
+[submodule "plugins/CVfunk"]
+	path = plugins/CVfunk
+	url = https://github.com/codygeary/CVfunk-Modules.git
diff --git a/README.md b/README.md
@@ -139,6 +139,7 @@ At the moment the following 3rd-party modules are provided:
 - [Catro/Modulo](https://github.com/catronomix/catro-modulo)
 - [cf](https://github.com/cfoulc/cf)
 - [ChowDSP](https://github.com/jatinchowdhury18/ChowDSP-VCV)
+- [CVfunk](https://github.com/codygeary/CVfunk-Modules)
 - [dBiz](https://github.com/dBiz/dBiz)
 - [DHE Modules](https://github.com/dhemery/DHE-Modules)
 - [DrumKit](https://svmodular.com/plugin/vcv/drumkit.html)

diff --git a/docs/LICENSES.md b/docs/LICENSES.md
@@ -33,6 +33,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
 | Catro/Modulo            | BSD-3-Clause             | |
 | cf                      | BSD-3-Clause             | |
 | ChowDSP                 | GPL-3.0-or-later         | |
+| CVfunk                  | MIT                      | |
 | dBiz                    | GPL-3.0-or-later         | |
 | DHE-Modules             | MIT                      | |
 | DrumKit                 | CC0-1.0                  | |
@@ -157,6 +158,7 @@ Below is a list of artwork licenses from plugins
 | cf/VT323-Regular.ttf                    | OFL-1.1-no-RFN   | |
 | ChowDSP/*                               | GPL-3.0-or-later | Same license as source code |
 | ChowDSP/fonts/RobotoCondensed-*.ttf     | Apache-2.0       | |
+| CVfunk/*                                | MIT              | Same license as source code |
 | dBiz/*                                  | CC-BY-NC-ND-4.0  | |
 | dBiz/DejaVuSansMono.ttf                 | Bitstream-Vera   | |
 | dBiz/ShareTechMono-Regular.ttf          | OFL-1.1          | |

diff --git a/plugins/CVfunk b/plugins/CVfunk
diff --git a/plugins/Makefile b/plugins/Makefile
@@ -645,6 +645,14 @@ PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp))
 # modules/types which are present in other plugins
 CF_CUSTOM = $(DRWAV)
 
+# --------------------------------------------------------------
+# CVfunk
+
+PLUGIN_FILES += $(filter-out CVfunk/src/plugin.cpp,$(wildcard CVfunk/src/*.cpp))
+
+# modules/types which are present in other plugins
+CVFUNK_CUSTOM = Steps
+
 # --------------------------------------------------------------
 # dBiz
 
@@ -2199,6 +2207,13 @@ $(BUILD_DIR)/cf/src/%.cpp.o: cf/src/%.cpp
 		-DpluginInstance=pluginInstance__cf \
 		-Wno-misleading-indentation
 
+$(BUILD_DIR)/CVfunk/src/%.cpp.o: CVfunk/src/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(CVFUNK_CUSTOM),$(call custom_module_names,$(m),CVfunk)) \
+		-DpluginInstance=pluginInstance__CVfunk
+
 $(BUILD_DIR)/ChowDSP/%.cpp.o: ChowDSP/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"

diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
@@ -298,6 +298,11 @@ extern Model* modelTestVCF;
 // cf
 #include "cf/src/plugin.hpp"
 
+// CVfunk
+#define modelSteps modelCVfunkSteps
+#include "CVfunk/src/plugin.hpp"
+#undef modelSteps
+
 // ChowDSP
 #include "ChowDSP/src/plugin.hpp"
 #define init initChowDSP
@@ -859,6 +864,7 @@ Plugin* pluginInstance__BogaudioModules;
 Plugin* pluginInstance__CatroModulo;
 Plugin* pluginInstance__cf;
 Plugin* pluginInstance__ChowDSP;
+Plugin* pluginInstance__CVfunk;
 Plugin* pluginInstance__dBiz;
 Plugin* pluginInstance__DHE;
 extern Plugin* pluginInstance__DrumKit;
@@ -1821,6 +1827,25 @@ static void initStatic__ChowDSP()
     }
 }
 
+static void initStatic__CVfunk()
+{
+    Plugin* const p = new Plugin;
+    pluginInstance__CVfunk = p;
+
+    const StaticPluginLoader spl(p, "CVfunk");
+    if (spl.ok())
+    {
+#define modelSteps modelCVfunkSteps
+		p->addModel(modelSteps);
+		p->addModel(modelEnvelopeArray);
+		p->addModel(modelPentaSequencer);
+		p->addModel(modelImpulseController);
+		p->addModel(modelSignals);
+		p->addModel(modelRanges);
+#undef modelSteps
+    }
+}
+
 static void initStatic__dBiz()
 {
     Plugin* const p = new Plugin;
@@ -3213,6 +3238,7 @@ void initStaticPlugins()
     initStatic__CatroModulo();
     initStatic__cf();
     initStatic__ChowDSP();
+    initStatic__CVfunk();
     initStatic__dBiz();
     initStatic__DHE();
     initStatic__DrumKit();