Merge branch 'master' into cairocanvas

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

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 8d209cc78e29c936519a1b874036e13249ec7600..6d68df688f4e152781c672cd1836cb4eb444d039 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -611,7 +611,9 @@ PluginManager::lxvst_refresh ()
        }
 
        if (lxvst_path.length() == 0) {
-               lxvst_path = "/usr/local/lib64/lxvst:/usr/local/lib/lxvst:/usr/lib64/lxvst:/usr/lib/lxvst";
+               lxvst_path = "/usr/local/lib64/lxvst:/usr/local/lib/lxvst:/usr/lib64/lxvst:/usr/lib/lxvst:"
+                       "/usr/local/lib64/linux_vst:/usr/local/lib/linux_vst:/usr/lib64/linux_vst:/usr/lib/linux_vst:"
+                       "/usr/lib/vst:/usr/local/lib/vst";
        }
 
        lxvst_discover_from_path (lxvst_path);
@@ -643,6 +645,10 @@ PluginManager::lxvst_discover_from_path (string path)
        vector<string *>::iterator x;
        int ret = 0;
 
+#ifndef NDEBUG
+       (void) path;
+#endif
+
        DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering linuxVST plugins along %1\n", path));
 
        plugin_objects = scanner (lxvst_path, lxvst_filter, 0, false, true);