Fix samples-moved (and invalid use of not initialized CubicInterpolation)

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

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 2e6b9912b815594b0f517b805a8ff7165621d442..378d260176d925de0c7bcb8037e7ae47f44af90f 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -60,6 +60,7 @@
 #include "ardour/mac_vst_support.h"
 #include "ardour/mac_vst_plugin.h"
 #include "pbd/basename.h"
+#include "pbd/pathexpand.h"
 #include <cstring>
 #endif //MACVST_SUPPORT
 
@@ -846,6 +847,11 @@ PluginManager::windows_vst_discover_from_path (string path, bool cache_only)
 
        DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering Windows VST plugins along %1\n", path));
 
+       if (Session::get_disable_all_loaded_plugins ()) {
+               info << _("Disabled WindowsVST scan (safe mode)") << endmsg;
+               return -1;
+       }
+
        if (Config->get_verbose_plugin_scan()) {
                info << string_compose (_("--- Windows VST plugins Scan: %1"), path) << endmsg;
        }
@@ -1029,11 +1035,8 @@ PluginManager::mac_vst_refresh (bool cache_only)
        mac_vst_discover_from_path ("~/Library/Audio/Plug-Ins/VST:/Library/Audio/Plug-Ins/VST", cache_only);
 }
 
-static bool mac_vst_filter (const string& str, void *)
+static bool mac_vst_filter (const string& str)
 {
-       if (!Glib::file_test (str, Glib::FILE_TEST_IS_DIR)) {
-               return false;
-       }
        string plist = Glib::build_filename (str, "Contents", "Info.plist");
        if (!Glib::file_test (plist, Glib::FILE_TEST_IS_REGULAR)) {
                return false;
@@ -1044,15 +1047,43 @@ static bool mac_vst_filter (const string& str, void *)
 int
 PluginManager::mac_vst_discover_from_path (string path, bool cache_only)
 {
-       vector<string> plugin_objects;
-       vector<string>::iterator x;
+       if (Session::get_disable_all_loaded_plugins ()) {
+               info << _("Disabled MacVST scan (safe mode)") << endmsg;
+               return -1;
+       }
 
-       find_paths_matching_filter (plugin_objects, path, mac_vst_filter, 0, true, true, false);
+       Searchpath paths (path);
+       /* customized version of run_functor_for_paths() */
+       for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
+               string expanded_path = path_expand (*i);
+               if (!Glib::file_test (expanded_path, Glib::FILE_TEST_IS_DIR)) continue;
+               try {
+                       Glib::Dir dir(expanded_path);
+                       for (Glib::DirIterator di = dir.begin(); di != dir.end(); di++) {
+                               string fullpath = Glib::build_filename (expanded_path, *di);
 
-       for (x = plugin_objects.begin(); x != plugin_objects.end (); ++x) {
-               ARDOUR::PluginScanMessage(_("MacVST"), *x, !cache_only && !cancelled());
-               mac_vst_discover (*x, cache_only || cancelled());
+                               /* we're only interested in bundles */
+                               if (!Glib::file_test (fullpath, Glib::FILE_TEST_IS_DIR)) {
+                                       continue;
+                               }
+
+                               if (mac_vst_filter (fullpath)) {
+                                       ARDOUR::PluginScanMessage(_("MacVST"), fullpath, !cache_only && !cancelled());
+                                       mac_vst_discover (fullpath, cache_only || cancelled());
+                                       continue;
+                               }
+
+                               /* don't descend into AU bundles in the VST dir */
+                               if (fullpath[0] == '.' || (fullpath.length() > 10 && strings_equal_ignore_case (".component", fullpath.substr(fullpath.length() - 10)))) {
+                                       continue;
+                               }
+
+                               /* recurse */
+                               mac_vst_discover_from_path (fullpath, cache_only);
+                       }
+               } catch (Glib::FileError& err) { }
        }
+
        return 0;
 }
 
@@ -1150,6 +1181,11 @@ PluginManager::lxvst_discover_from_path (string path, bool cache_only)
        vector<string>::iterator x;
        int ret = 0;
 
+       if (Session::get_disable_all_loaded_plugins ()) {
+               info << _("Disabled LinuxVST scan (safe mode)") << endmsg;
+               return -1;
+       }
+
 #ifndef NDEBUG
        (void) path;
 #endif
@@ -1372,6 +1408,8 @@ PluginManager::load_statuses ()
                        type = Windows_VST;
                } else if (stype == "LXVST") {
                        type = LXVST;
+               } else if (stype == "MacVST") {
+                       type = MacVST;
                } else if (stype == "Lua") {
                        type = Lua;
                } else {