From 9eb553eb3c5fed080c8358de6ce447ffd869970e Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 28 Oct 2021 19:35:57 +0100 Subject: [PATCH] Handle Befaco ADSR conflict Signed-off-by: falkTX --- plugins/Makefile | 3 +++ plugins/plugins.cpp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/plugins/Makefile b/plugins/Makefile index a11402c..5e4a541 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -308,6 +308,9 @@ PLUGIN_FILES += AudibleInstruments/eurorack/streams/compressor.cc 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 + # -------------------------------------------------------------- # Bidoo diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index a657dde..048ef40 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -40,7 +40,9 @@ #include "AudibleInstruments/src/plugin.hpp" // Befaco +#define modelADSR modelBefacoADSR #include "Befaco/src/plugin.hpp" +#undef modelADSR // Bidoo #include "Bidoo/src/plugin.hpp" @@ -544,6 +546,7 @@ static void initStatic__Befaco() const StaticPluginLoader spl(p, "Befaco"); if (spl.ok()) { +#define modelADSR modelBefacoADSR p->addModel(modelEvenVCO); p->addModel(modelRampage); p->addModel(modelABC); @@ -561,6 +564,7 @@ static void initStatic__Befaco() p->addModel(modelSTMix); p->addModel(modelMuxlicer); p->addModel(modelMex); +#undef modelADSR } }