carla-vst: expose first plugin params for host automation; cleanup

Signed-off-by: falkTX <[email protected]>
falkTX · Mar 21, 2019 · d4a0292 · d4a0292
1 parent 1dc76b5
commit d4a0292
Show file tree

Hide file tree

Showing 24 changed files with 942 additions and 641 deletions.
diff --git a/source/backend/engine/CarlaEngineNative.cpp b/source/backend/engine/CarlaEngineNative.cpp
diff --git a/source/backend/plugin/CarlaPluginNative.cpp b/source/backend/plugin/CarlaPluginNative.cpp
@@ -2058,17 +2058,19 @@ class CarlaPluginNative : public CarlaPlugin
 
         if (fHandle2 == nullptr)
         {
-            fDescriptor->process(fHandle, fAudioInBuffers, fAudioOutBuffers, frames, fMidiInEvents, fMidiEventInCount);
+            fDescriptor->process(fHandle,
+                                 const_cast<const float**>(fAudioInBuffers), fAudioOutBuffers, frames,
+                                 fMidiInEvents, fMidiEventInCount);
         }
         else
         {
             fDescriptor->process(fHandle,
-                                 (pData->audioIn.count > 0) ? &fAudioInBuffers[0] : nullptr,
+                                 (pData->audioIn.count > 0) ? const_cast<const float**>(&fAudioInBuffers[0]) : nullptr,
                                  (pData->audioOut.count > 0) ? &fAudioOutBuffers[0] : nullptr,
                                  frames, fMidiInEvents, fMidiEventInCount);
 
             fDescriptor->process(fHandle2,
-                                 (pData->audioIn.count > 0) ? &fAudioInBuffers[1] : nullptr,
+                                 (pData->audioIn.count > 0) ? const_cast<const float**>(&fAudioInBuffers[1]) : nullptr,
                                  (pData->audioOut.count > 0) ? &fAudioOutBuffers[1] : nullptr,
                                  frames, fMidiInEvents, fMidiEventInCount);
         }

diff --git a/source/includes/CarlaNative.h b/source/includes/CarlaNative.h
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugin API
- * Copyright (C) 2012-2014 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -199,7 +199,8 @@ typedef struct {
     const char* (*ui_open_file)(NativeHostHandle handle, bool isDir, const char* title, const char* filter);
     const char* (*ui_save_file)(NativeHostHandle handle, bool isDir, const char* title, const char* filter);
 
-    intptr_t (*dispatcher)(NativeHostHandle handle, NativeHostDispatcherOpcode opcode, int32_t index, intptr_t value, void* ptr, float opt);
+    intptr_t (*dispatcher)(NativeHostHandle handle,
+                           NativeHostDispatcherOpcode opcode, int32_t index, intptr_t value, void* ptr, float opt);
 
 } NativeHostDescriptor;
 
@@ -244,12 +245,15 @@ typedef struct _NativePluginDescriptor {
 
     void (*activate)(NativePluginHandle handle);
     void (*deactivate)(NativePluginHandle handle);
-    void (*process)(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount);
+    void (*process)(NativePluginHandle handle,
+                    const float** inBuffer, float** outBuffer, uint32_t frames,
+                    const NativeMidiEvent* midiEvents, uint32_t midiEventCount);
 
     char* (*get_state)(NativePluginHandle handle);
     void  (*set_state)(NativePluginHandle handle, const char* data);
 
-    intptr_t (*dispatcher)(NativePluginHandle handle, NativePluginDispatcherOpcode opcode, int32_t index, intptr_t value, void* ptr, float opt);
+    intptr_t (*dispatcher)(NativePluginHandle handle,
+                           NativePluginDispatcherOpcode opcode, int32_t index, intptr_t value, void* ptr, float opt);
 
 } NativePluginDescriptor;
 

diff --git a/source/includes/CarlaNative.hpp b/source/includes/CarlaNative.hpp
@@ -282,7 +282,8 @@ class NativePluginClass
 
     virtual void deactivate() {}
 
-    virtual void process(float** const inBuffer, float** const outBuffer, const uint32_t frames, const NativeMidiEvent* const midiEvents, const uint32_t midiEventCount) = 0;
+    virtual void process(const float** const inBuffer, float** const outBuffer, const uint32_t frames,
+                         const NativeMidiEvent* const midiEvents, const uint32_t midiEventCount) = 0;
 
     // -------------------------------------------------------------------
     // Plugin UI calls
@@ -454,7 +455,9 @@ class NativePluginClass
         handlePtr->deactivate();
     }
 
-    static void _process(NativePluginHandle handle, float** inBuffer, float** outBuffer, const uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+    static void _process(NativePluginHandle handle,
+                         const float** inBuffer, float** outBuffer, const uint32_t frames,
+                         const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
     {
         handlePtr->process(inBuffer, outBuffer, frames, midiEvents, midiEventCount);
     }
@@ -469,7 +472,8 @@ class NativePluginClass
         handlePtr->setState(data);
     }
 
-    static intptr_t _dispatcher(NativePluginHandle handle, NativePluginDispatcherOpcode opcode, int32_t index, intptr_t value, void* ptr, float opt)
+    static intptr_t _dispatcher(NativePluginHandle handle,
+                                NativePluginDispatcherOpcode opcode, int32_t index, intptr_t value, void* ptr, float opt)
     {
         switch(opcode)
         {

diff --git a/source/native-plugins/audio-file.cpp b/source/native-plugins/audio-file.cpp
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2013-2018 Filipe Coelho <[email protected]>
+ * Copyright (C) 2013-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -118,7 +118,8 @@ class AudioFilePlugin : public NativePluginClass,
     // -------------------------------------------------------------------
     // Plugin process calls
 
-    void process(float**, float** const outBuffer, const uint32_t frames, const NativeMidiEvent*, uint32_t) override
+    void process(const float**, float** const outBuffer, const uint32_t frames,
+                 const NativeMidiEvent*, uint32_t) override
     {
         const NativeTimeInfo* const timePos(getTimeInfo());
 

diff --git a/source/native-plugins/bigmeter.cpp b/source/native-plugins/bigmeter.cpp
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2017 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -154,7 +154,8 @@ class BigMeterPlugin : public NativePluginAndUiClass
         fOutRight = 0.0f;
     }
 
-    void process(float** inputs, float**, const uint32_t frames, const NativeMidiEvent* const, const uint32_t) override
+    void process(const float** inputs, float**, const uint32_t frames,
+                 const NativeMidiEvent* const, const uint32_t) override
     {
         fOutLeft  = carla_findMaxNormalizedFloat(inputs[0], frames);
         fOutRight = carla_findMaxNormalizedFloat(inputs[1], frames);

diff --git a/source/native-plugins/bypass.c b/source/native-plugins/bypass.c
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2014 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -30,9 +30,12 @@ static NativePluginHandle bypass_instantiate(const NativeHostDescriptor* host)
     (void)host;
 }
 
-static void bypass_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void bypass_process(NativePluginHandle handle,
+                           const float** inBuffer, float** outBuffer, uint32_t frames,
+                           const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
-    memcpy(outBuffer[0], inBuffer[0], sizeof(float)*frames);
+    if (outBuffer[0] != inBuffer[0])
+        memcpy(outBuffer[0], inBuffer[0], sizeof(float)*frames);
     return;
 
     // unused

diff --git a/source/native-plugins/lfo.c b/source/native-plugins/lfo.c
@@ -205,7 +205,9 @@ static void lfo_set_parameter_value(NativePluginHandle handle, uint32_t index, f
     }
 }
 
-static void lfo_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void lfo_process(NativePluginHandle handle,
+                        const float** inBuffer, float** outBuffer, uint32_t frames,
+                        const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host     = handlePtr->host;
     const NativeTimeInfo*       const timeInfo = host->get_time_info(host->handle);

diff --git a/source/native-plugins/midi-channel-ab.c b/source/native-plugins/midi-channel-ab.c
@@ -106,7 +106,9 @@ static void midichanab_set_parameter_value(NativePluginHandle handle, uint32_t i
     handlePtr->channels[index] = (value >= 0.5f);
 }
 
-static void midichanab_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midichanab_process(NativePluginHandle handle,
+                               const float** inBuffer, float** outBuffer, uint32_t frames,
+                               const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host     = handlePtr->host;
     const bool*                 const channels = handlePtr->channels;

diff --git a/source/native-plugins/midi-channel-filter.c b/source/native-plugins/midi-channel-filter.c
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2015 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -106,7 +106,9 @@ static void midichanfilter_set_parameter_value(NativePluginHandle handle, uint32
     handlePtr->channels[index] = (value >= 0.5f);
 }
 
-static void midichanfilter_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midichanfilter_process(NativePluginHandle handle,
+                                   const float** inBuffer, float** outBuffer, uint32_t frames,
+                                   const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host     = handlePtr->host;
     const bool*                 const channels = handlePtr->channels;

diff --git a/source/native-plugins/midi-channelize.c b/source/native-plugins/midi-channelize.c
@@ -113,7 +113,9 @@ static void midichannelize_set_parameter_value(NativePluginHandle handle, uint32
     }
 }
 
-static void midichannelize_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midichannelize_process(NativePluginHandle handle,
+                                   const float** inBuffer, float** outBuffer, uint32_t frames,
+                                   const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
     const int channel = handlePtr->channel;

diff --git a/source/native-plugins/midi-file.cpp b/source/native-plugins/midi-file.cpp
@@ -51,7 +51,7 @@ class MidiFilePlugin : public NativePluginClass,
     // -------------------------------------------------------------------
     // Plugin process calls
 
-    void process(float**, float**, const uint32_t frames, const NativeMidiEvent* const, const uint32_t) override
+    void process(const float**, float**, const uint32_t frames, const NativeMidiEvent* const, const uint32_t) override
     {
         const NativeTimeInfo* const timePos(getTimeInfo());
 

diff --git a/source/native-plugins/midi-gain.c b/source/native-plugins/midi-gain.c
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2014 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -168,7 +168,9 @@ static void midigain_set_parameter_value(NativePluginHandle handle, uint32_t ind
     }
 }
 
-static void midigain_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midigain_process(NativePluginHandle handle,
+                             const float** inBuffer, float** outBuffer, uint32_t frames,
+                             const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
     const float gain           = handlePtr->gain;

diff --git a/source/native-plugins/midi-join.c b/source/native-plugins/midi-join.c
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2018 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -47,7 +47,9 @@ static void midijoin_cleanup(NativePluginHandle handle)
     free(handlePtr);
 }
 
-static void midijoin_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midijoin_process(NativePluginHandle handle,
+                             const float** inBuffer, float** outBuffer, uint32_t frames,
+                             const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
     NativeMidiEvent tmpEvent;

diff --git a/source/native-plugins/midi-pattern.cpp b/source/native-plugins/midi-pattern.cpp
@@ -210,7 +210,7 @@ class MidiPatternPlugin : public NativePluginAndUiClass,
     // -------------------------------------------------------------------
     // Plugin process calls
 
-    void process(float**, float**, const uint32_t frames, const NativeMidiEvent*, uint32_t) override
+    void process(const float**, float**, const uint32_t frames, const NativeMidiEvent*, uint32_t) override
     {
         if (const NativeTimeInfo* const timeInfo = getTimeInfo())
             fTimeInfo = *timeInfo;

diff --git a/source/native-plugins/midi-split.c b/source/native-plugins/midi-split.c
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2014 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -46,7 +46,9 @@ static void midisplit_cleanup(NativePluginHandle handle)
     free(handlePtr);
 }
 
-static void midisplit_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midisplit_process(NativePluginHandle handle,
+                              const float** inBuffer, float** outBuffer, uint32_t frames,
+                              const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
     NativeMidiEvent tmpEvent;

diff --git a/source/native-plugins/midi-through.c b/source/native-plugins/midi-through.c
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2014 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -46,7 +46,9 @@ static void midithrough_cleanup(NativePluginHandle handle)
     free(handlePtr);
 }
 
-static void midithrough_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void midithrough_process(NativePluginHandle handle,
+                                const float** inBuffer, float** outBuffer, uint32_t frames,
+                                const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
 

diff --git a/source/native-plugins/midi-transpose.c b/source/native-plugins/midi-transpose.c
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2018 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -130,7 +130,9 @@ static void miditranspose_set_parameter_value(NativePluginHandle handle, uint32_
     }
 }
 
-static void miditranspose_process(NativePluginHandle handle, float** inBuffer, float** outBuffer, uint32_t frames, const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
+static void miditranspose_process(NativePluginHandle handle,
+                                  const float** inBuffer, float** outBuffer, uint32_t frames,
+                                  const NativeMidiEvent* midiEvents, uint32_t midiEventCount)
 {
     const NativeHostDescriptor* const host = handlePtr->host;
     const int octaves = handlePtr->octaves;

diff --git a/source/native-plugins/notes.cpp b/source/native-plugins/notes.cpp
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2014 Filipe Coelho <[email protected]>
+ * Copyright (C) 2012-2019 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -83,7 +83,7 @@ class NotesPlugin : public NativePluginAndUiClass
     // -------------------------------------------------------------------
     // Plugin process calls
 
-    void process(float**, float**, const uint32_t, const NativeMidiEvent* const, const uint32_t) override
+    void process(const float**, float**, const uint32_t, const NativeMidiEvent* const, const uint32_t) override
     {
     }
 

diff --git a/source/plugin/carla-lv2.cpp b/source/plugin/carla-lv2.cpp
@@ -287,10 +287,7 @@ class NativePlugin : public Lv2PluginBaseClass<NativeTimeInfo>
             }
         }
 
-        // FIXME
-        fDescriptor->process(fHandle,
-                             const_cast<float**>(fPorts.audioIns), fPorts.audioOuts, frames,
-                             fMidiEvents, fMidiEventCount);
+        fDescriptor->process(fHandle, fPorts.audioIns, fPorts.audioOuts, frames, fMidiEvents, fMidiEventCount);
 
         if (fWorkerUISignal == -1 && fPorts.hasUI)
         {

diff --git a/source/plugin/carla-vst-export.cpp b/source/plugin/carla-vst-export.cpp
@@ -101,3 +101,12 @@ intptr_t VSTAudioMaster(AEffect* effect, int32_t opcode, int32_t index, intptr_t
     const audioMasterCallback audioMaster = (audioMasterCallback)((VstObject*)effect->object)->audioMaster;
     return audioMaster(effect, opcode, index, value, ptr, opt);
 }
+
+bool isUsingUILauncher()
+{
+#ifdef CARLA_OS_LINUX
+    return false;
+#else
+    return true;
+#endif
+}