carla: add fallback to released cv variant

meson.build

@@ -461,9 +461,12 @@ cdata.set_quoted (
 cdata.set_quoted (
   'BUG_REPORT_API_ENDPOINT',
   'https://accounts.zrythm.org/api/v1/error-reports/new')
-if (get_option ('user_manual'))
+if get_option ('user_manual')
   cdata.set_quoted ('MANUAL_PATH', docdir)
 endif
+if get_option ('carla_use_cv32_patchbay_variant')
+  cdata.set ('CARLA_HAVE_CV32_PATCHBAY_VARIANT', 1)
+endif
 
 if os_windows
   cdata.set ('USE_MMCSS_THREAD_PRIORITIES', 1)
@@ -1086,7 +1089,6 @@ if have_guile
 endif
 
 carla_host_plugin_dep = dependency (
-  # note: using unreleased changes
   'carla-host-plugin', version: '>=2.4.1',
   required: get_option ('carla'),
   static: all_static)

meson_options.txt

@@ -188,6 +188,12 @@ option (
   value: false,
   description: 'Use static dependencies where possible.')
 
+option (
+  'carla_use_cv32_patchbay_variant',
+  type: 'boolean',
+  value: false,
+  description: 'Use new CV32 variant that supports up to 64 audio ins/outs and 32 cv ins/outs (needs carla-git).')
+
 option (
   'carla_binaries_dir',
   type: 'string',

src/plugins/carla_native_plugin.c

@@ -55,10 +55,17 @@
 
 #include <CarlaHost.h>
 
+#ifdef CARLA_HAVE_CV32_PATCHBAY_VARIANT
 #define MAX_VARIANT_AUDIO_INS 64
 #define MAX_VARIANT_AUDIO_OUTS 64
 #define MAX_VARIANT_CV_INS 32
 #define MAX_VARIANT_CV_OUTS 32
+#else
+#define MAX_VARIANT_AUDIO_INS 2
+#define MAX_VARIANT_AUDIO_OUTS 2
+#define MAX_VARIANT_CV_INS 5
+#define MAX_VARIANT_CV_OUTS 5
+#endif
 #define MAX_VARIANT_MIDI_INS 1
 #define MAX_VARIANT_MIDI_OUTS 1
 
@@ -1263,8 +1270,13 @@ carla_native_plugin_instantiate (
   self->time_info.bbt.valid = 1;
 
   /* instantiate the plugin to get its info */
+#ifdef CARLA_HAVE_CV32_PATCHBAY_VARIANT
   self->native_plugin_descriptor =
     carla_get_native_patchbay_cv32_plugin ();
+#else
+  self->native_plugin_descriptor =
+    carla_get_native_patchbay_cv_plugin ();
+#endif
   self->native_plugin_handle =
     self->native_plugin_descriptor->instantiate (
       &self->native_host_descriptor);