DPF

commit 793c580f8d64ee33c0257814efb0ab3b1be2497e
parent 3e301868c211600f5855ed1913914f84b3b2aa46
Author: falkTX <falktx@gmail.com>
Date:   Wed, 13 Aug 2014 23:44:32 +0100

Fix vst plugin for some hosts (ardour3 and energyXT on linux)

Diffstat:
M
distrho/src/DistrhoPluginInternal.hpp
 | 
12
++++++++++++
M
distrho/src/DistrhoPluginVST.cpp
 | 
12
++++++++++--

2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/distrho/src/DistrhoPluginInternal.hpp b/distrho/src/DistrhoPluginInternal.hpp
@@ -377,6 +377,18 @@ public:
 
     // -------------------------------------------------------------------
 
+    uint32_t getBufferSize() const noexcept
+    {
+        DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr, 0);
+        return fData->bufferSize;
+    }
+
+    double getSampleRate() const noexcept
+    {
+        DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr, 0.0);
+        return fData->sampleRate;
+    }
+
     void setBufferSize(const uint32_t bufferSize, bool doCallback = false)
     {
         DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr,);
diff --git a/distrho/src/DistrhoPluginVST.cpp b/distrho/src/DistrhoPluginVST.cpp
@@ -404,7 +404,8 @@ public:
             }
             else
             {
-                d_lastUiSampleRate = fAudioMaster(fEffect, audioMasterGetSampleRate, 0, 0, nullptr, 0.0f);
+                d_lastUiSampleRate = fPlugin.getSampleRate();
+
                 UIExporter tmpUI(nullptr, 0, nullptr, nullptr, nullptr, nullptr, nullptr);
                 fVstRect.right  = tmpUI.getWidth();
                 fVstRect.bottom = tmpUI.getHeight();
@@ -421,7 +422,7 @@ public:
                     return 0;
 # endif
 
-                d_lastUiSampleRate = fAudioMaster(fEffect, audioMasterGetSampleRate, 0, 0, nullptr, 0.0f);
+                d_lastUiSampleRate = fPlugin.getSampleRate();
 
                 fVstUi = new UIVst(fAudioMaster, fEffect, this, &fPlugin, (intptr_t)ptr);
 
@@ -823,6 +824,13 @@ static intptr_t vst_dispatcherCallback(AEffect* effect, int32_t opcode, int32_t 
 #endif
             d_lastBufferSize = audioMaster(effect, audioMasterGetBlockSize, 0, 0, nullptr, 0.0f);
             d_lastSampleRate = audioMaster(effect, audioMasterGetSampleRate, 0, 0, nullptr, 0.0f);
+
+            // some hosts are not ready at this point or return 0 buffersize/samplerate
+            if (d_lastBufferSize == 0)
+                d_lastBufferSize = 2048;
+            if (d_lastSampleRate <= 0.0)
+                d_lastSampleRate = 44100.0;
+
             PluginVst* const plugin(new PluginVst(audioMaster, effect));
 #ifdef VESTIGE_HEADER
             effect->ptr2 = plugin;