From 1e38385c155127daeccf3ba82c970b9b13b25a5a Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 16 Nov 2021 11:55:38 +0000
Subject: [PATCH] Update Bidoo and fix it

Signed-off-by: falkTX <falktx@falktx.com>
---
 .gitmodules         |  2 +-
 plugins/Bidoo       |  2 +-
 plugins/Makefile    | 17 ++++-------------
 plugins/plugins.cpp |  4 ++++
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 231703f..e0eefa6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,7 +33,7 @@
 	url = https://github.com/bogaudio/BogaudioModules.git
 [submodule "plugins/Bidoo"]
 	path = plugins/Bidoo
-	url = https://github.com/sebastien-bouffier/Bidoo.git
+	url = https://github.com/CardinalModules/Bidoo.git
 [submodule "plugins/ESeries"]
 	path = plugins/ESeries
 	url = https://github.com/VCVRack/ESeries.git
diff --git a/plugins/Bidoo b/plugins/Bidoo
index a719345..ba9661f 160000
--- a/plugins/Bidoo
+++ b/plugins/Bidoo
@@ -1 +1 @@
-Subproject commit a7193458bff4f9a56850278fa406d20dd9e40cb2
+Subproject commit ba9661fb45b01073645f41fd0d57124c27737c74
diff --git a/plugins/Makefile b/plugins/Makefile
index 99d33fb..2fe8355 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -350,6 +350,7 @@ PLUGIN_FILES += $(wildcard Bidoo/src/dep/*.cpp)
 PLUGIN_FILES += $(wildcard Bidoo/src/dep/filters/*.cpp)
 PLUGIN_FILES += $(wildcard Bidoo/src/dep/freeverb/*.cpp)
 PLUGIN_FILES += $(wildcard Bidoo/src/dep/lodepng/*.cpp)
+PLUGIN_FILES += $(wildcard Bidoo/src/dep/resampler/*.cpp)
 
 # modules/types which are present in other plugins
 BIDOO_CUSTOM = LadderFilter $(DRWAV)
@@ -799,19 +800,9 @@ $(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp
 		$(foreach m,$(BIDOO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),Bidoo_$(shell basename $*))) \
 		-DpluginInstance=pluginInstance__Bidoo \
 		-IBidoo/src/dep/gverb/include \
-		-Wno-sign-compare
-
-# FIXME -DPRIVATE=extern shouldn't be here
-$(BUILD_DIR)/Bidoo/src/dep/%.cpp.o: Bidoo/src/dep/%.cpp
-	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
-	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
-		$(foreach m,$(BIDOO_CUSTOM),$(call custom_module_names,$(m),Bidoo)) \
-		$(foreach m,$(BIDOO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),Bidoo_$(shell basename $*))) \
-		-DpluginInstance=pluginInstance__Bidoo \
-		-DPRIVATE=extern \
-		-IBidoo/src/dep/gverb/include \
-		-Wno-sign-compare
+		-Wno-ignored-qualifiers \
+		-Wno-sign-compare \
+		-Wno-unused-function
 
 $(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
index 7dea819..3c2d7f5 100644
--- a/plugins/plugins.cpp
+++ b/plugins/plugins.cpp
@@ -650,6 +650,9 @@ static void initStatic__Bidoo()
         p->addModel(modelMU);
         p->addModel(modelCHUTE);
         p->addModel(modelLOURDE);
+        p->addModel(modelDILEMO);
+        p->addModel(modelLAMBDA);
+        p->addModel(modelBANCAU);
         p->addModel(modelACNE);
         p->addModel(modelMS);
         p->addModel(modelDUKE);
@@ -657,6 +660,7 @@ static void initStatic__Bidoo()
         p->addModel(modelPILOT);
         p->addModel(modelHUITRE);
         p->addModel(modelOUAIVE);
+        p->addModel(modelEDSAROS);
         p->addModel(modelPOUPRE);
         p->addModel(modelMAGMA);
         p->addModel(modelOAI);