2nd revert

.gitmodules

@@ -10,6 +10,9 @@
 [submodule "plugins/Cardinal/sse2neon"]
 	path = include/sse2neon
 	url = https://github.com/DLTcollab/sse2neon.git
+[submodule "plugins/Befaco"]
+	path = plugins/Befaco
+	url = https://github.com/VCVRack/Befaco.git
 [submodule "plugins/AudibleInstruments"]
 	path = plugins/AudibleInstruments
 	url = https://github.com/CardinalModules/AudibleInstruments.git

README.md

@@ -109,6 +109,7 @@ At the moment the following 3rd-party modules are provided:
 - Audible Instruments
 - Autinn
 - Bacon Music
+- Befaco
 - Bidoo
 - Bogaudio
 - cf

docs/LICENSES.md

@@ -20,6 +20,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
 | Audible Instruments     | GPL-3.0-or-later      | |
 | Autinn                  | GPL-3.0-or-later      | |
 | Bacon Music             | GPL-3.0-or-later      | |
+| Befaco                  | GPL-3.0-or-later      | Custom artwork license, permission granted |
 | Bidoo                   | GPL-3.0-or-later      | |
 | Bogaudio                | GPL-3.0-or-later      | |
 | cf                      | BSD-3-Clause          | |
@@ -86,6 +87,8 @@ Below is a list of artwork licenses from plugins
 | BaconPlugs/1f953.svg                    | CC-BY-4.0        | |
 | BaconPlugs/Keypunch029.json             | OFL-1.1          | |
 | Bidoo/*                                 | CC-BY-NC-ND-4.0  | [Special permission granted for runtime dark mode](https://github.com/sebastien-bouffier/Bidoo/issues/191) |
+| Befaco/components/*                     | CC-BY-NC-4.0     | |
+| Befaco/panels/*                         | Custom           | Copyright © [Befaco](https://www.befaco.org/), used and distributed with permission |
 | BogaudioModules/*                       | CC-BY-SA-4.0     | |
 | BogaudioModules/fonts/audiowide.ttf     | OFL-1.1-RFN      | |
 | BogaudioModules/fonts/inconsolata*.ttf  | OFL-1.1-no-RFN   | |

plugins/Makefile

@@ -377,6 +377,15 @@ PLUGIN_FILES += $(filter-out BaconPlugs/src/BaconPlugs.cpp,$(wildcard BaconPlugs
 PLUGIN_FILES += $(wildcard BaconPlugs/libs/midifile/src/*.cpp)
 PLUGIN_FILES += $(wildcard BaconPlugs/libs/open303-code/Source/DSPCode/*.cpp)
 
+# --------------------------------------------------------------
+# Befaco
+
+PLUGIN_FILES += $(filter-out Befaco/src/plugin.cpp,$(wildcard Befaco/src/*.cpp))
+PLUGIN_BINARIES += Befaco/src/SpringReverbIR.pcm
+
+# modules/types which are present in other plugins
+BEFACO_CUSTOM = ADSR Mixer
+
 # --------------------------------------------------------------
 # Bidoo
 
@@ -1088,6 +1097,13 @@ $(BUILD_DIR)/BaconPlugs/%.cpp.o: BaconPlugs/%.cpp
 		-Wno-array-bounds \
 		-Wno-strict-aliasing
 
+$(BUILD_DIR)/Befaco/%.cpp.o: Befaco/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(BEFACO_CUSTOM),$(call custom_module_names,$(m),Befaco)) \
+		-DpluginInstance=pluginInstance__Befaco
+
 $(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"

plugins/plugins.cpp

@@ -103,6 +103,13 @@ extern Model* modelChord;
 #undef SCREW_WIDTH
 #undef RACK_HEIGHT
 
+// Befaco
+#define modelADSR modelBefacoADSR
+#define modelMixer modelBefacoMixer
+#include "Befaco/src/plugin.hpp"
+#undef modelADSR
+#undef modelMixer
+
 // Bidoo
 #include "Bidoo/src/plugin.hpp"
 
@@ -527,6 +534,7 @@ Plugin* pluginInstance__Aria;
 Plugin* pluginInstance__AudibleInstruments;
 extern Plugin* pluginInstance__Autinn;
 Plugin* pluginInstance__Bacon;
+Plugin* pluginInstance__Befaco;
 Plugin* pluginInstance__Bidoo;
 Plugin* pluginInstance__BogaudioModules;
 Plugin* pluginInstance__cf;
@@ -899,6 +907,38 @@ static void initStatic__Bacon()
     }
 }
 
+static void initStatic__Befaco()
+{
+    Plugin* const p = new Plugin;
+    pluginInstance__Befaco = p;
+
+    const StaticPluginLoader spl(p, "Befaco");
+    if (spl.ok())
+    {
+#define modelADSR modelBefacoADSR
+#define modelMixer modelBefacoMixer
+        p->addModel(modelEvenVCO);
+        p->addModel(modelRampage);
+        p->addModel(modelABC);
+        p->addModel(modelSpringReverb);
+        p->addModel(modelMixer);
+        p->addModel(modelSlewLimiter);
+        p->addModel(modelDualAtenuverter);
+        p->addModel(modelPercall);
+        p->addModel(modelHexmixVCA);
+        p->addModel(modelChoppingKinky);
+        p->addModel(modelKickall);
+        p->addModel(modelSamplingModulator);
+        p->addModel(modelMorphader);
+        p->addModel(modelADSR);
+        p->addModel(modelSTMix);
+        p->addModel(modelMuxlicer);
+        p->addModel(modelMex);
+#undef modelADSR
+#undef modelMixer
+    }
+}
+
 static void initStatic__Bidoo()
 {
     Plugin* const p = new Plugin;
@@ -1854,6 +1894,7 @@ void initStaticPlugins()
     initStatic__AudibleInstruments();
     initStatic__Autinn();
     initStatic__Bacon();
+    initStatic__Befaco();
     initStatic__Bidoo();
     initStatic__BogaudioModules();
     initStatic__cf();