fix merge issues with master

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

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 6a24a33b60b22376b3041ff8224fc7ae0adafdef..90522a7e06b2ca76efea55d2bff2b49e7f5b355f 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -278,9 +278,10 @@ PluginManager::ladspa_discover_from_path (string /*path*/)
                for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
                        ladspa_discover (**x);
                }
+
+               vector_delete (plugin_objects);
        }
 
-       vector_delete (plugin_objects);
        return ret;
 }
 
@@ -334,9 +335,9 @@ PluginManager::add_presets(string domain)
                                warning << string_compose(_("Could not parse rdf file: %1"), *x) << endmsg;
                        }
                }
+               
+               vector_delete (presets);
        }
-
-       vector_delete (presets);
 }
 
 void
@@ -356,9 +357,9 @@ PluginManager::add_lrdf_data (const string &path)
                                warning << "Could not parse rdf file: " << uri << endmsg;
                        }
                }
-       }
 
-       vector_delete (rdf_files);
+               vector_delete (rdf_files);
+       }
 }
 
 int
@@ -579,9 +580,10 @@ PluginManager::windows_vst_discover_from_path (string path)
                for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
                        windows_vst_discover (**x);
                }
+
+               vector_delete (plugin_objects);
        }
 
-       vector_delete (plugin_objects);
        return ret;
 }
 
@@ -597,8 +599,8 @@ PluginManager::windows_vst_discover (string path)
        }
 
        if (!finfo->canProcessReplacing) {
-               warning << string_compose (_("VST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"),
-                                   finfo->name)
+               warning << string_compose (_("VST plugin %1 does not support processReplacing, and so cannot be used in %2 at this time"),
+                                          finfo->name, PROGRAM_NAME)
                        << endl;
        }
 
@@ -684,9 +686,10 @@ PluginManager::lxvst_discover_from_path (string path)
                for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
                        lxvst_discover (**x);
                }
+
+               vector_delete (plugin_objects);
        }
 
-       vector_delete (plugin_objects);
        return ret;
 }
 
@@ -696,13 +699,15 @@ PluginManager::lxvst_discover (string path)
        VSTInfo* finfo;
        char buf[32];
 
+       DEBUG_TRACE (DEBUG::PluginManager, string_compose ("checking apparent LXVST plugin at %1\n", path));
+
        if ((finfo = vstfx_get_info (const_cast<char *> (path.c_str()))) == 0) {
                return -1;
        }
 
        if (!finfo->canProcessReplacing) {
-               warning << string_compose (_("linuxVST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"),
-                                   finfo->name)
+               warning << string_compose (_("linuxVST plugin %1 does not support processReplacing, and so cannot be used in %2 at this time"),
+                                          finfo->name, PROGRAM_NAME)
                        << endl;
        }