Don't allow multi-midi-port plugins in patchbay for now; Cleanup

source/backend/engine/CarlaEngine.cpp

@@ -524,6 +524,43 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype,
     if (plugin == nullptr)
         return false;
 
+    bool canRun = true;
+
+    /**/ if (pData->options.processMode == ENGINE_PROCESS_MODE_CONTINUOUS_RACK)
+    {
+        /**/ if (! plugin->canRunInRack())
+        {
+            setLastError("Carla's rack mode can only work with Mono or Stereo plugins, sorry!");
+            canRun = false;
+        }
+        else if (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0)
+        {
+            setLastError("Carla's rack mode cannot work with plugins that have CV ports, sorry!");
+            canRun = false;
+        }
+    }
+    else if (pData->options.processMode == ENGINE_PROCESS_MODE_PATCHBAY)
+    {
+        /**/ if (plugin->getMidiInCount() > 0 || plugin->getMidiOutCount() > 0)
+        {
+            setLastError("Carla's patchbay mode cannot work with plugins that have multiple MIDI ports, sorry!");
+            canRun = false;
+        }
+        else if (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0)
+        {
+            setLastError("CV ports in patchbay mode is still TODO");
+            canRun = false;
+        }
+    }
+
+    if (! canRun)
+    {
+        delete plugin;
+        return false;
+    }
+
+    plugin->reload();
+
 #if defined(HAVE_LIBLO) && ! defined(BUILD_BRIDGE)
     plugin->registerToOscClient();
 #endif

source/backend/plugin/CarlaPluginBridge.cpp

@@ -2690,35 +2690,6 @@ CarlaPlugin* CarlaPlugin::newBridge(const Initializer& init, BinaryType btype, P
         return nullptr;
     }
 
-    plugin->reload();
-
-    bool canRun = true;
-
-    if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_CONTINUOUS_RACK)
-    {
-        if (! plugin->canRunInRack())
-        {
-            init.engine->setLastError("Carla's rack mode can only work with Stereo Bridged plugins, sorry!");
-            canRun = false;
-        }
-        else if (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0)
-        {
-            init.engine->setLastError("Carla's rack mode cannot work with plugins that have CV ports, sorry!");
-            canRun = false;
-        }
-    }
-    else if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_PATCHBAY && (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0))
-    {
-        init.engine->setLastError("CV ports in patchbay mode is still TODO");
-        canRun = false;
-    }
-
-    if (! canRun)
-    {
-        delete plugin;
-        return nullptr;
-    }
-
     return plugin;
 }
 

source/backend/plugin/CarlaPluginDSSI.cpp

@@ -2815,35 +2815,6 @@ CarlaPlugin* CarlaPlugin::newDSSI(const Initializer& init)
         return nullptr;
     }
 
-    plugin->reload();
-
-    bool canRun = true;
-
-    if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_CONTINUOUS_RACK)
-    {
-        if (! plugin->canRunInRack())
-        {
-            init.engine->setLastError("Carla's rack mode can only work with Mono or Stereo DSSI plugins, sorry!");
-            canRun = false;
-        }
-        else if (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0)
-        {
-            init.engine->setLastError("Carla's rack mode cannot work with plugins that have CV ports, sorry!");
-            canRun = false;
-        }
-    }
-    else if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_PATCHBAY && (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0))
-    {
-        init.engine->setLastError("CV ports in patchbay mode is still TODO");
-        canRun = false;
-    }
-
-    if (! canRun)
-    {
-        delete plugin;
-        return nullptr;
-    }
-
     return plugin;
 }
 

source/backend/plugin/CarlaPluginFluidSynth.cpp

@@ -1697,8 +1697,6 @@ CarlaPlugin* CarlaPlugin::newFluidSynth(const Initializer& init, const bool use1
         return nullptr;
     }
 
-    plugin->reload();
-
     return plugin;
 #else
     init.engine->setLastError("fluidsynth support not available");

source/backend/plugin/CarlaPluginJuce.cpp

@@ -1274,15 +1274,6 @@ CarlaPlugin* CarlaPlugin::newJuce(const Initializer& init, const char* const for
         return nullptr;
     }
 
-    plugin->reload();
-
-    if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_CONTINUOUS_RACK && ! plugin->canRunInRack())
-    {
-        init.engine->setLastError("Carla's rack mode can only work with Stereo VST3 plugins, sorry!");
-        delete plugin;
-        return nullptr;
-    }
-
     return plugin;
 #else
     init.engine->setLastError("Juce plugin not available");

source/backend/plugin/CarlaPluginLADSPA.cpp

@@ -1842,25 +1842,6 @@ CarlaPlugin* CarlaPlugin::newLADSPA(const Initializer& init, const LADSPA_RDF_De
         return nullptr;
     }
 
-    plugin->reload();
-
-    bool canRun = true;
-
-    if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_CONTINUOUS_RACK)
-    {
-        if (! plugin->canRunInRack())
-        {
-            init.engine->setLastError("Carla's rack mode can only work with Mono or Stereo LADSPA plugins, sorry!");
-            canRun = false;
-        }
-    }
-
-    if (! canRun)
-    {
-        delete plugin;
-        return nullptr;
-    }
-
     return plugin;
 }
 

source/backend/plugin/CarlaPluginLV2.cpp

@@ -6181,35 +6181,6 @@ CarlaPlugin* CarlaPlugin::newLV2(const Initializer& init)
         return nullptr;
     }
 
-    plugin->reload();
-
-    bool canRun = true;
-
-    if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_CONTINUOUS_RACK)
-    {
-        if (! plugin->canRunInRack())
-        {
-            init.engine->setLastError("Carla's rack mode can only work with Mono or Stereo LV2 plugins, sorry!");
-            canRun = false;
-        }
-        else if (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0)
-        {
-            init.engine->setLastError("Carla's rack mode cannot work with plugins that have CV ports, sorry!");
-            canRun = false;
-        }
-    }
-    else if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_PATCHBAY && (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0))
-    {
-        init.engine->setLastError("CV ports in patchbay mode is still TODO");
-        canRun = false;
-    }
-
-    if (! canRun)
-    {
-        delete plugin;
-        return nullptr;
-    }
-
     return plugin;
 }
 

source/backend/plugin/CarlaPluginLinuxSampler.cpp

@@ -1431,8 +1431,6 @@ CarlaPlugin* CarlaPlugin::newLinuxSampler(const Initializer& init, const char* c
         return nullptr;
     }
 
-    plugin->reload();
-
     return plugin;
 #else
     init.engine->setLastError("linuxsampler support not available");

source/backend/plugin/CarlaPluginNative.cpp

@@ -2475,35 +2475,6 @@ CarlaPlugin* CarlaPlugin::newNative(const Initializer& init)
         return nullptr;
     }
 
-    plugin->reload();
-
-    bool canRun = true;
-
-    if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_CONTINUOUS_RACK)
-    {
-        if (! plugin->canRunInRack())
-        {
-            init.engine->setLastError("Carla's rack mode can only work with Mono or Stereo Internal plugins, sorry!");
-            canRun = false;
-        }
-        else if (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0)
-        {
-            init.engine->setLastError("Carla's rack mode cannot work with plugins that have CV ports, sorry!");
-            canRun = false;
-        }
-    }
-    else if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_PATCHBAY && (plugin->getCVInCount() > 0 || plugin->getCVInCount() > 0))
-    {
-        init.engine->setLastError("CV ports in patchbay mode is still TODO");
-        canRun = false;
-    }
-
-    if (! canRun)
-    {
-        delete plugin;
-        return nullptr;
-    }
-
     return plugin;
 }
 

source/backend/plugin/CarlaPluginVST2.cpp

@@ -2423,15 +2423,6 @@ CarlaPlugin* CarlaPlugin::newVST2(const Initializer& init)
         return nullptr;
     }
 
-    plugin->reload();
-
-    if (init.engine->getProccessMode() == ENGINE_PROCESS_MODE_CONTINUOUS_RACK && ! plugin->canRunInRack())
-    {
-        init.engine->setLastError("Carla's rack mode can only work with Stereo VST plugins, sorry!");
-        delete plugin;
-        return nullptr;
-    }
-
     return plugin;
 #endif
 }