forward port 2.X changes up to and including rev 6909

[ardour.git] / libs / ardour / plugin_manager.cc

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index f4d638e3bc87ed77e4b8c0aea5a855e2307eda50..91c4d715d5f80f4625d1fc32dcebd9ff364fe20d 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -145,7 +145,9 @@ PluginManager::PluginManager ()
 
 PluginManager::~PluginManager()
 {
+#ifdef HAVE_SLV2
        delete _lv2_world;
+#endif
 }
 
 
@@ -199,7 +201,7 @@ PluginManager::ladspa_refresh ()
                                case ':' :
                                case '\0':
                                        continue;
-                               case '/' :
+                               case G_DIR_SEPARATOR :
                                        if (ladspa_path[found + strlen(standard_paths[i]) + 1] == ':' ||
                                            ladspa_path[found + strlen(standard_paths[i]) + 1] == '\0') {
                                                continue;
@@ -556,6 +558,7 @@ PluginManager::vst_discover (string path)
        info->index = 0;
        info->n_inputs.set_audio (finfo->numInputs);
        info->n_outputs.set_audio (finfo->numOutputs);
+       info->n_inputs.set_midi (finfo->wantMidi ? 1 : 0);
        info->type = ARDOUR::VST;
 
        _vst_plugin_info->push_back (info);