Tweak name conflicts for dBiz

Signed-off-by: falkTX <[email protected]>
DISTRHO · Sep 8, 2022 · b7f756c · b7f756c
1 parent 46dcb39
commit b7f756c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,8 @@
 *Cardinal, the Rack!*
 
 Cardinal is a free and open-source virtual modular synthesizer plugin,
-available as JACK standalone and AU, LV2, VST2, VST3 and CLAP audio plugin for FreeBSD, Linux, macOS and Windows.  
+available as CLAP, LV2, VST2 and VST3 audio plugin for FreeBSD, Linux, macOS and Windows.  
+Plus AU and JACK or Native audio standalone for some systems.  
 It is based on the popular [VCV Rack](https://vcvrack.com/) but with a focus on being a fully self-contained plugin version.
 
 More specifically, this is a [DPF-based](https://github.com/DISTRHO/DPF/)

diff --git a/dpf b/dpf
diff --git a/plugins/Makefile b/plugins/Makefile
@@ -399,7 +399,9 @@ AS_CUSTOM_PER_FILE = NumberDisplayWidget
 PLUGIN_FILES += $(filter-out dBiz/src/plugin.cpp,$(wildcard dBiz/src/*.cpp))
 
 # modules/types which are present in other plugins
-DBIZ_CUSTOM = Chord DarkDefaultItem Divider OrangeLight VCA4 darkPanelID lightPanelID
+DBIZ_CUSTOM  = Chord DarkDefaultItem Divider FourSeq FourSeqWidget OrangeLight VCA4 Wavefolder
+DBIZ_CUSTOM += darkPanelID lightPanelID
+DBIZ_CUSTOM_PER_FILE = MultiFilter Oscillator calcOutput process sineOsc subBank
 
 # --------------------------------------------------------------
 # AudibleInstruments

diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
@@ -321,21 +321,21 @@ extern Model* modelTestVCF;
 void setupSamples();
 
 // dBiz
-#define darkPanelID dBizdarkPanelID
 #define DarkDefaultItem dBizDarkDefaultItem
-#define lightPanelID dBizlightPanelID
 #define OrangeLight dBizOrangeLight
+#define darkPanelID dBizdarkPanelID
+#define lightPanelID dBizlightPanelID
 #define modelChord modeldBizChord
-#define modelVCA4 modeldBizVCA4
 #define modelDivider modeldBizDivider
+#define modelVCA4 modeldBizVCA4
 #include "dBiz/src/plugin.hpp"
-#undef darkPanelID
 #undef DarkDefaultItem
-#undef lightPanelID
 #undef OrangeLight
+#undef darkPanelID
+#undef lightPanelID
 #undef modelChord
-#undef modelVCA4
 #undef modelDivider
+#undef modelVCA4
 
 // ESeries
 #include "ESeries/src/plugin.hpp"
@@ -1737,8 +1737,8 @@ static void initStatic__dBiz()
     if (spl.ok())
     {
 #define modelChord modeldBizChord
-#define modelVCA4 modeldBizVCA4
 #define modelDivider modeldBizDivider
+#define modelVCA4 modeldBizVCA4
         p->addModel(modelNavControl);
         p->addModel(modelBench);
         p->addModel(modelContorno);
@@ -1773,8 +1773,8 @@ static void initStatic__dBiz()
         p->addModel(modelOrder);
         p->addModel(modelDualMatrix);
 #undef modelChord
-#undef modelVCA4
 #undef modelDivider
+#undef modelVCA4
     }
 }