From 7b10ed3a8fa9c27e5a13b29730d4aa74f2724db1 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 27 Oct 2012 10:55:07 +0100
Subject: [PATCH] Carla: Re-order some init calls for better handling bridge
 modes

---
 c++/carla-backend/dssi.cpp   | 22 +++++++++++-----------
 c++/carla-backend/ladspa.cpp | 22 +++++++++++-----------
 c++/carla-backend/lv2.cpp    | 22 +++++++++++-----------
 c++/carla-backend/vst.cpp    |  4 ++--
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/c++/carla-backend/dssi.cpp b/c++/carla-backend/dssi.cpp
index 55c4221..bf68a30 100644
--- a/c++/carla-backend/dssi.cpp
+++ b/c++/carla-backend/dssi.cpp
@@ -1466,17 +1466,6 @@ public:
             return false;
         }
 
-        // ---------------------------------------------------------------
-        // initialize plugin
-
-        handle = ldescriptor->instantiate(ldescriptor, x_engine->getSampleRate());
-
-        if (! handle)
-        {
-            setLastError("Plugin failed to initialize");
-            return false;
-        }
-
         // ---------------------------------------------------------------
         // get info
 
@@ -1498,6 +1487,17 @@ public:
             return false;
         }
 
+        // ---------------------------------------------------------------
+        // initialize plugin
+
+        handle = ldescriptor->instantiate(ldescriptor, x_engine->getSampleRate());
+
+        if (! handle)
+        {
+            setLastError("Plugin failed to initialize");
+            return false;
+        }
+
         // ---------------------------------------------------------------
         // gui stuff
 
diff --git a/c++/carla-backend/ladspa.cpp b/c++/carla-backend/ladspa.cpp
index 6ff0570..4a6062a 100644
--- a/c++/carla-backend/ladspa.cpp
+++ b/c++/carla-backend/ladspa.cpp
@@ -1082,17 +1082,6 @@ public:
             return false;
         }
 
-        // ---------------------------------------------------------------
-        // initialize plugin
-
-        handle = descriptor->instantiate(descriptor, x_engine->getSampleRate());
-
-        if (! handle)
-        {
-            setLastError("Plugin failed to initialize");
-            return false;
-        }
-
         // ---------------------------------------------------------------
         // get info
 
@@ -1119,6 +1108,17 @@ public:
             return false;
         }
 
+        // ---------------------------------------------------------------
+        // initialize plugin
+
+        handle = descriptor->instantiate(descriptor, x_engine->getSampleRate());
+
+        if (! handle)
+        {
+            setLastError("Plugin failed to initialize");
+            return false;
+        }
+
         return true;
     }
 
diff --git a/c++/carla-backend/lv2.cpp b/c++/carla-backend/lv2.cpp
index 64e83bf..cdd0231 100644
--- a/c++/carla-backend/lv2.cpp
+++ b/c++/carla-backend/lv2.cpp
@@ -4014,17 +4014,6 @@ public:
         features[lv2_feature_id_worker]->URI      = LV2_WORKER__schedule;
         features[lv2_feature_id_worker]->data     = workerFt;
 
-        // ---------------------------------------------------------------
-        // initialize plugin
-
-        handle = descriptor->instantiate(descriptor, x_engine->getSampleRate(), rdf_descriptor->Bundle, features);
-
-        if (! handle)
-        {
-            setLastError("Plugin failed to initialize");
-            return false;
-        }
-
         // ---------------------------------------------------------------
         // get info
 
@@ -4046,6 +4035,17 @@ public:
             return false;
         }
 
+        // ---------------------------------------------------------------
+        // initialize plugin
+
+        handle = descriptor->instantiate(descriptor, x_engine->getSampleRate(), rdf_descriptor->Bundle, features);
+
+        if (! handle)
+        {
+            setLastError("Plugin failed to initialize");
+            return false;
+        }
+
         // ---------------------------------------------------------------
         // gui stuff
 
diff --git a/c++/carla-backend/vst.cpp b/c++/carla-backend/vst.cpp
index 3163984..7cc8399 100644
--- a/c++/carla-backend/vst.cpp
+++ b/c++/carla-backend/vst.cpp
@@ -2145,7 +2145,7 @@ public:
         }
 
         // ---------------------------------------------------------------
-        // initialize plugin
+        // initialize plugin (part 1)
 
         lastVstPlugin = this;
         effect = vstFn(hostCallback);
@@ -2198,7 +2198,7 @@ public:
         }
 
         // ---------------------------------------------------------------
-        // initialize VST stuff
+        // initialize plugin (part 2)
 
 #if ! VST_FORCE_DEPRECATED
         effect->dispatcher(effect, effSetBlockSizeAndSampleRate, 0, x_engine->getBufferSize(), nullptr, x_engine->getSampleRate());