Preparations for AU support, cleanup

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Mar 10, 2024 · 8cdbaba · 8cdbaba
1 parent ee17809
commit 8cdbaba
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 31 deletions.
diff --git a/dpf b/dpf
diff --git a/plugins/3BandEQ/DistrhoPlugin3BandEQ.hpp b/plugins/3BandEQ/DistrhoPlugin3BandEQ.hpp
@@ -74,11 +74,6 @@ class DistrhoPlugin3BandEQ : public Plugin
         return d_version(1, 0, 0);
     }
 
-    int64_t getUniqueId() const noexcept override
-    {
-        return d_cconst('D', '3', 'E', 'Q');
-    }
-
     // -------------------------------------------------------------------
     // Init
 

diff --git a/plugins/3BandEQ/DistrhoPluginInfo.h b/plugins/3BandEQ/DistrhoPluginInfo.h
@@ -1,6 +1,6 @@
 /*
  * DISTRHO 3BandEQ Plugin, based on 3BandEQ by Michael Gruhn
- * Copyright (C) 2012-2022 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2024 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,9 @@
 #define DISTRHO_PLUGIN_URI     "http://distrho.sf.net/plugins/3BandEQ"
 #define DISTRHO_PLUGIN_CLAP_ID "studio.kx.distrho.3BandEQ"
 
+#define DISTRHO_PLUGIN_BRAND_ID  Dstr
+#define DISTRHO_PLUGIN_UNIQUE_ID D3EQ
+
 #define DISTRHO_PLUGIN_HAS_UI        1
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 #define DISTRHO_PLUGIN_NUM_INPUTS    2
@@ -32,4 +35,6 @@
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:EQPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|EQ"
 
+#define DPF_VST3_DONT_USE_BRAND_ID
+
 #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED
diff --git a/plugins/3BandEQ/Makefile b/plugins/3BandEQ/Makefile
@@ -24,18 +24,17 @@ FILES_UI  = \
 
 UI_TYPE = generic
 FILE_BROWSER_DISABLED = true
+SKIP_NATIVE_AUDIO_FALLBACK = true
 include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-TARGETS = jack ladspa lv2_sep vst2 vst3 clap
+TARGETS = au clap jack ladspa lv2_sep vst2 vst3
 
-ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
-ifeq ($(HAVE_LIBLO),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL)$(HAVE_LIBLO),truetrue)
 TARGETS += dssi
 endif
-endif
 
 all: $(TARGETS)
 

diff --git a/plugins/3BandSplitter/DistrhoPlugin3BandSplitter.hpp b/plugins/3BandSplitter/DistrhoPlugin3BandSplitter.hpp
@@ -82,11 +82,6 @@ class DistrhoPlugin3BandSplitter : public Plugin
         return d_version(1, 0, 0);
     }
 
-    int64_t getUniqueId() const noexcept override
-    {
-        return d_cconst('D', '3', 'E', 'S');
-    }
-
     // -------------------------------------------------------------------
     // Init
 

diff --git a/plugins/3BandSplitter/DistrhoPluginInfo.h b/plugins/3BandSplitter/DistrhoPluginInfo.h
@@ -1,6 +1,6 @@
 /*
  * DISTRHO 3BandSplitter Plugin, based on 3BandSplitter by Michael Gruhn
- * Copyright (C) 2012-2022 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2024 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,9 @@
 #define DISTRHO_PLUGIN_URI     "http://distrho.sf.net/plugins/3BandSplitter"
 #define DISTRHO_PLUGIN_CLAP_ID "studio.kx.distrho.3BandSplitter"
 
+#define DISTRHO_PLUGIN_BRAND_ID  Dstr
+#define DISTRHO_PLUGIN_UNIQUE_ID D3ES
+
 #define DISTRHO_PLUGIN_HAS_UI        1
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 #define DISTRHO_PLUGIN_NUM_INPUTS    2
@@ -32,4 +35,6 @@
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:EQPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|EQ"
 
+#define DPF_VST3_DONT_USE_BRAND_ID
+
 #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED
diff --git a/plugins/3BandSplitter/Makefile b/plugins/3BandSplitter/Makefile
@@ -24,18 +24,17 @@ FILES_UI  = \
 
 UI_TYPE = generic
 FILE_BROWSER_DISABLED = true
+SKIP_NATIVE_AUDIO_FALLBACK = true
 include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-TARGETS = jack ladspa lv2_sep vst2 vst3 clap
+TARGETS = au clap jack ladspa lv2_sep vst2 vst3
 
-ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
-ifeq ($(HAVE_LIBLO),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL)$(HAVE_LIBLO),truetrue)
 TARGETS += dssi
 endif
-endif
 
 all: $(TARGETS)
 

diff --git a/plugins/PingPongPan/DistrhoPluginInfo.h b/plugins/PingPongPan/DistrhoPluginInfo.h
@@ -1,6 +1,6 @@
 /*
  * DISTRHO PingPongPan Plugin, based on PingPongPan by Michael Gruhn
- * Copyright (C) 2012-2022 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2024 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,9 @@
 #define DISTRHO_PLUGIN_URI     "http://distrho.sf.net/plugins/PingPongPan"
 #define DISTRHO_PLUGIN_CLAP_ID "studio.kx.distrho.PingPongPan"
 
+#define DISTRHO_PLUGIN_BRAND_ID  Dstr
+#define DISTRHO_PLUGIN_UNIQUE_ID DPPP
+
 #define DISTRHO_PLUGIN_HAS_UI        1
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 #define DISTRHO_PLUGIN_NUM_INPUTS    2
@@ -32,4 +35,6 @@
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:SpatialPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Spatial"
 
+#define DPF_VST3_DONT_USE_BRAND_ID
+
 #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED
diff --git a/plugins/PingPongPan/DistrhoPluginPingPongPan.hpp b/plugins/PingPongPan/DistrhoPluginPingPongPan.hpp
@@ -70,11 +70,6 @@ class DistrhoPluginPingPongPan : public Plugin
         return d_version(1, 0, 0);
     }
 
-    int64_t getUniqueId() const noexcept override
-    {
-        return d_cconst('D', 'P', 'P', 'P');
-    }
-
     // -------------------------------------------------------------------
     // Init
 

diff --git a/plugins/PingPongPan/Makefile b/plugins/PingPongPan/Makefile
@@ -24,18 +24,17 @@ FILES_UI  = \
 
 UI_TYPE = generic
 FILE_BROWSER_DISABLED = true
+SKIP_NATIVE_AUDIO_FALLBACK = true
 include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-TARGETS = jack ladspa lv2_sep vst2 vst3 clap
+TARGETS = au clap jack ladspa lv2_sep vst2 vst3
 
-ifeq ($(HAVE_CAIRO_OR_OPENGL),true)
-ifeq ($(HAVE_LIBLO),true)
+ifeq ($(HAVE_CAIRO_OR_OPENGL)$(HAVE_LIBLO),truetrue)
 TARGETS += dssi
 endif
-endif
 
 all: $(TARGETS)