From ad33ca6cd901cd254de0f81bf491272d7d0db6d8 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 28 Dec 2021 16:37:55 +0000 Subject: [PATCH] Make variants usage less confusing in code; Fix missing vst3 fx Signed-off-by: falkTX --- dpf | 2 +- src/Cardinal/DistrhoPluginInfo.h | 15 ++++++++++----- src/CardinalFX/DistrhoPluginInfo.h | 15 ++++++++++----- src/CardinalPlugin.cpp | 10 +++++----- src/CardinalSynth/DistrhoPluginInfo.h | 14 +++++++++----- src/Makefile.cardinal.mk | 2 +- 6 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dpf b/dpf index b325295..c7e77db 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit b325295d6c77032eeb042aacd242683aa1773f5d +Subproject commit c7e77db0ac265dd031c14a912108235c39733971 diff --git a/src/Cardinal/DistrhoPluginInfo.h b/src/Cardinal/DistrhoPluginInfo.h index 80a50e6..8531e52 100644 --- a/src/Cardinal/DistrhoPluginInfo.h +++ b/src/Cardinal/DistrhoPluginInfo.h @@ -18,6 +18,13 @@ #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_INFO_H_INCLUDED +#define CARDINAL_VARIANT_MAIN 1 +#define CARDINAL_VARIANT_FX 0 +#define CARDINAL_VARIANT_SYNTH 0 + +#define CARDINAL_NUM_AUDIO_INPUTS 8 +#define CARDINAL_NUM_AUDIO_OUTPUTS 8 + #define DISTRHO_PLUGIN_BRAND "DISTRHO" #define DISTRHO_PLUGIN_NAME "Cardinal" #define DISTRHO_PLUGIN_URI "https://distrho.kx.studio/plugins/cardinal" @@ -30,8 +37,9 @@ #define DISTRHO_UI_USE_NANOVG 1 #define DISTRHO_UI_USER_RESIZABLE 1 #endif -#define DISTRHO_PLUGIN_NUM_INPUTS 18 -#define DISTRHO_PLUGIN_NUM_OUTPUTS 18 +#define DISTRHO_PLUGIN_IS_SYNTH 0 +#define DISTRHO_PLUGIN_NUM_INPUTS CARDINAL_NUM_AUDIO_INPUTS + 10 +#define DISTRHO_PLUGIN_NUM_OUTPUTS CARDINAL_NUM_AUDIO_OUTPUTS + 10 #define DISTRHO_PLUGIN_WANT_MIDI_INPUT 1 #define DISTRHO_PLUGIN_WANT_MIDI_OUTPUT 1 #define DISTRHO_PLUGIN_WANT_FULL_STATE 1 @@ -40,7 +48,4 @@ // #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:AnalyserPlugin" // #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Analyzer" -#define CARDINAL_NUM_AUDIO_INPUTS 8 -#define CARDINAL_NUM_AUDIO_OUTPUTS 8 - #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/src/CardinalFX/DistrhoPluginInfo.h b/src/CardinalFX/DistrhoPluginInfo.h index d9891cb..0b5e1a1 100644 --- a/src/CardinalFX/DistrhoPluginInfo.h +++ b/src/CardinalFX/DistrhoPluginInfo.h @@ -18,6 +18,13 @@ #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_INFO_H_INCLUDED +#define CARDINAL_VARIANT_MAIN 0 +#define CARDINAL_VARIANT_FX 1 +#define CARDINAL_VARIANT_SYNTH 0 + +#define CARDINAL_NUM_AUDIO_INPUTS 2 +#define CARDINAL_NUM_AUDIO_OUTPUTS 2 + #define DISTRHO_PLUGIN_BRAND "DISTRHO" #define DISTRHO_PLUGIN_NAME "Cardinal FX" #define DISTRHO_PLUGIN_URI "https://distrho.kx.studio/plugins/cardinal#fx" @@ -30,8 +37,9 @@ #define DISTRHO_UI_USE_NANOVG 1 #define DISTRHO_UI_USER_RESIZABLE 1 #endif -#define DISTRHO_PLUGIN_NUM_INPUTS 2 -#define DISTRHO_PLUGIN_NUM_OUTPUTS 2 +#define DISTRHO_PLUGIN_IS_SYNTH 0 +#define DISTRHO_PLUGIN_NUM_INPUTS CARDINAL_NUM_AUDIO_INPUTS +#define DISTRHO_PLUGIN_NUM_OUTPUTS CARDINAL_NUM_AUDIO_OUTPUTS #define DISTRHO_PLUGIN_WANT_MIDI_INPUT 1 #define DISTRHO_PLUGIN_WANT_MIDI_OUTPUT 1 #define DISTRHO_PLUGIN_WANT_FULL_STATE 1 @@ -40,7 +48,4 @@ // #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:AnalyserPlugin" // #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Analyzer" -#define CARDINAL_NUM_AUDIO_INPUTS DISTRHO_PLUGIN_NUM_INPUTS -#define CARDINAL_NUM_AUDIO_OUTPUTS DISTRHO_PLUGIN_NUM_OUTPUTS - #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/src/CardinalPlugin.cpp b/src/CardinalPlugin.cpp index 46aeb75..cf9356d 100644 --- a/src/CardinalPlugin.cpp +++ b/src/CardinalPlugin.cpp @@ -552,9 +552,9 @@ protected: const char* getLabel() const override { -#if DISTRHO_PLUGIN_IS_SYNTH +#if CARDINAL_VARIANT_SYNTH return "CardinalSynth"; -#elif DISTRHO_PLUGIN_NUM_INPUTS == 2 +#elif CARDINAL_VARIANT_FX return "CardinalFX"; #else return "Cardinal"; @@ -590,9 +590,9 @@ protected: int64_t getUniqueId() const override { -#if DISTRHO_PLUGIN_IS_SYNTH +#if CARDINAL_VARIANT_SYNTH return d_cconst('d', 'C', 'n', 'S'); -#elif DISTRHO_PLUGIN_NUM_INPUTS == 2 +#elif CARDINAL_VARIANT_FX return d_cconst('d', 'C', 'n', 'F'); #else return d_cconst('d', 'C', 'd', 'n'); @@ -953,7 +953,7 @@ protected: #endif } -#if CARDINAL_NUM_AUDIO_OUTPUTS != 2 +#if CARDINAL_VARIANT_MAIN context->dataFrame = 0; context->dataIns = inputs; context->dataOuts = outputs; diff --git a/src/CardinalSynth/DistrhoPluginInfo.h b/src/CardinalSynth/DistrhoPluginInfo.h index 2066fe9..84a276e 100644 --- a/src/CardinalSynth/DistrhoPluginInfo.h +++ b/src/CardinalSynth/DistrhoPluginInfo.h @@ -18,6 +18,13 @@ #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_INFO_H_INCLUDED +#define CARDINAL_VARIANT_MAIN 0 +#define CARDINAL_VARIANT_FX 0 +#define CARDINAL_VARIANT_SYNTH 1 + +#define CARDINAL_NUM_AUDIO_INPUTS 0 +#define CARDINAL_NUM_AUDIO_OUTPUTS 2 + #define DISTRHO_PLUGIN_BRAND "DISTRHO" #define DISTRHO_PLUGIN_NAME "Cardinal Synth" #define DISTRHO_PLUGIN_URI "https://distrho.kx.studio/plugins/cardinal#synth" @@ -31,15 +38,12 @@ #define DISTRHO_UI_USER_RESIZABLE 1 #endif #define DISTRHO_PLUGIN_IS_SYNTH 1 -#define DISTRHO_PLUGIN_NUM_INPUTS 0 -#define DISTRHO_PLUGIN_NUM_OUTPUTS 2 +#define DISTRHO_PLUGIN_NUM_INPUTS CARDINAL_NUM_AUDIO_INPUTS +#define DISTRHO_PLUGIN_NUM_OUTPUTS CARDINAL_NUM_AUDIO_OUTPUTS #define DISTRHO_PLUGIN_WANT_MIDI_INPUT 1 #define DISTRHO_PLUGIN_WANT_MIDI_OUTPUT 1 #define DISTRHO_PLUGIN_WANT_FULL_STATE 1 #define DISTRHO_PLUGIN_WANT_STATE 1 #define DISTRHO_PLUGIN_WANT_TIMEPOS 1 -#define CARDINAL_NUM_AUDIO_INPUTS DISTRHO_PLUGIN_NUM_INPUTS -#define CARDINAL_NUM_AUDIO_OUTPUTS DISTRHO_PLUGIN_NUM_OUTPUTS - #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 3efdd56..e3c6881 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -240,7 +240,7 @@ BUILD_CXX_FLAGS += -DCARDINAL_PLUGIN_PREFIX='"$(PREFIX)"' ifeq ($(NAME),CardinalFX) -all: jack vst2 lv2 resources +all: jack lv2 vst2 vst3 resources CORE_RESOURCES = $(filter-out icon.png,$(subst ../Rack/res/,,$(wildcard ../Rack/res/*))) template.vcv