From 1f42487e9efd0da9d01b296994e0347e6703ea81 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 3 May 2024 18:16:31 +0200 Subject: [PATCH] Cleanup Signed-off-by: falkTX --- plugins/Makefile | 7 ++++--- plugins/plugins.cpp | 12 ++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index 97f0d81..727f73a 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -411,7 +411,7 @@ PLUGIN_FILES += AS/freeverb/revmodel.cpp # modules/types which are present in other plugins AS_CUSTOM = ADSR BpmDisplayWidget LabelDisplayWidget LedLight LowFrequencyOscillator SigDisplayWidget VCA WaveShaper YellowRedLight allpass comb revmodel -AS_CUSTOM_PER_FILE = NumberDisplayWidget MsDisplayWidget +AS_CUSTOM_PER_FILE = NumberDisplayWidget # -------------------------------------------------------------- # AudibleInstruments @@ -846,7 +846,7 @@ LILACLOOP_CUSTOM = AudioFile Mode PLUGIN_FILES += $(filter-out LittleUtils/src/plugin.cpp,$(wildcard LittleUtils/src/*.cpp)) # modules/types which are present in other plugins -LITTLEUTILS_CUSTOM = CustomTrimpot MsDisplayWidget MAX_POLY_CHANNELS +LITTLEUTILS_CUSTOM = MsDisplayWidget # -------------------------------------------------------------- # LomasModules @@ -973,10 +973,11 @@ PATHSET_CUSTOM = PitchShifter # -------------------------------------------------------------- # PdArray + PLUGIN_FILES += $(filter-out PdArray/src/plugin.cpp,$(wildcard PdArray/src/*.cpp)) # modules/types which are present in other plugins -PDARRAY_CUSTOM = $(DRWAV) MAX_POLY_CHANNELS TextBox CustomTrimpot MsDisplayWidget +PDARRAY_CUSTOM = $(DRWAV) CustomTrimpot MsDisplayWidget TextBox # -------------------------------------------------------------- # PinkTrombone diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index ec459d0..62062de 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -777,15 +777,15 @@ extern Model* modelBlankPanel; #include "PathSet/src/plugin.hpp" // PdArray -#define MAX_POLY_CHANNELS PDARRAYMAX_POLY_CHANNELS #define TextBox PdArrayTextBox #define CustomTrimpot PdArrayCustomTrimpot #define MsDisplayWidget PdArrayMsDisplayWidget +#define MAX_POLY_CHANNELS PDARRAY_MAX_POLY_CHANNELS #include "PdArray/src/plugin.hpp" -#undef PDARRAYMAX_POLY_CHANNELS #undef Textbox #undef CustomTrimpot #undef MsDisplayWidget +#undef PDARRAY_MAX_POLY_CHANNELS // PinkTrombone #include "PinkTrombone/src/plugin.hpp" @@ -2934,17 +2934,9 @@ static void initStatic__PdArray() const StaticPluginLoader spl(p, "PdArray"); if (spl.ok()) { -#define MAX_POLY_CHANNELS PDARRAYMAX_POLY_CHANNELS -#define TextBox PdArrayTextBox -#define CustomTrimpot PdArrayCustomTrimpot -#define MsDisplayWidget PdArrayMsDisplayWidget p->addModel(modelArray); p->addModel(modelMiniramp); p->addModel(modelMinistep); -#undef PDARRAYMAX_POLY_CHANNELS -#undef TextBox -#undef CustomTrimpot -#undef MsDisplayWidget } }