Revert "AU discover: remember discover-at-start setting"

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

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index e88541317c586ff42fc7c3dce307878d461688d4..458f7e15470e171c7f145811e096e71f79facc09 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -313,7 +313,7 @@ PluginManager::clear_vst_blacklist ()
 #ifdef WINDOWS_VST_SUPPORT
        {
                vector<string> fsi_files;
-               find_files_matching_regex (fsi_files, Config->get_plugin_path_vst(), "\\.fsb$", true);
+               find_files_matching_regex (fsi_files, Config->get_plugin_path_vst(), "\\" VST_EXT_BLACKLIST "$", true);
                for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) {
                        ::g_unlink(i->c_str());
                }
@@ -323,7 +323,7 @@ PluginManager::clear_vst_blacklist ()
 #ifdef LXVST_SUPPORT
        {
                vector<string> fsi_files;
-               find_files_matching_regex (fsi_files, Config->get_plugin_path_lxvst(), "\\.fsb$", true);
+               find_files_matching_regex (fsi_files, Config->get_plugin_path_lxvst(), "\\" VST_EXT_BLACKLIST "$", true);
                for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) {
                        ::g_unlink(i->c_str());
                }
@@ -335,7 +335,7 @@ PluginManager::clear_vst_blacklist ()
                string personal = get_personal_vst_blacklist_dir();
 
                vector<string> fsi_files;
-               find_files_matching_regex (fsi_files, personal, "\\.fsb$", /* flat user cache */ false);
+               find_files_matching_regex (fsi_files, personal, "\\" VST_EXT_BLACKLIST "$", /* flat user cache */ false);
                for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) {
                        ::g_unlink(i->c_str());
                }
@@ -686,8 +686,7 @@ PluginManager::windows_vst_refresh (bool cache_only)
 static bool windows_vst_filter (const string& str, void * /*arg*/)
 {
        /* Not a dotfile, has a prefix before a period, suffix is "dll" */
-
-       return str[0] != '.' && (str.length() > 4 && str.find (".dll") == (str.length() - 4));
+       return str[0] != '.' && str.length() > 4 && strings_equal_ignore_case (".dll", str.substr(str.length() - 4));
 }
 
 int
@@ -697,7 +696,11 @@ PluginManager::windows_vst_discover_from_path (string path, bool cache_only)
        vector<string>::iterator x;
        int ret = 0;
 
-       DEBUG_TRACE (DEBUG::PluginManager, string_compose ("detecting Windows VST plugins along %1\n", path));
+       DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering Windows VST plugins along %1\n", path));
+
+       if (Config->get_verbose_plugin_scan()) {
+               info << string_compose (_("--- Windows VST plugins Scan: %1"), path) << endmsg;
+       }
 
        find_files_matching_filter (plugin_objects, Config->get_plugin_path_vst(), windows_vst_filter, 0, false, true, true);
 
@@ -706,6 +709,10 @@ PluginManager::windows_vst_discover_from_path (string path, bool cache_only)
                windows_vst_discover (*x, cache_only || cancelled());
        }
 
+       if (Config->get_verbose_plugin_scan()) {
+               info << _("--- Windows VST plugins Scan Done") << endmsg;
+       }
+
        return ret;
 }
 
@@ -714,12 +721,22 @@ PluginManager::windows_vst_discover (string path, bool cache_only)
 {
        DEBUG_TRACE (DEBUG::PluginManager, string_compose ("windows_vst_discover '%1'\n", path));
 
+       if (Config->get_verbose_plugin_scan()) {
+               info << string_compose (_(" *  %1 %2"), path, (cache_only ? _(" (cache only)") : "")) << endmsg;
+       }
+
        _cancel_timeout = false;
        vector<VSTInfo*> * finfos = vstfx_get_info_fst (const_cast<char *> (path.c_str()),
                        cache_only ? VST_SCAN_CACHE_ONLY : VST_SCAN_USE_APP);
 
+       // TODO  get extended error messae from vstfx_get_info_fst() e.g  blacklisted, 32/64bit compat,
+       // .err file scanner output etc.
+
        if (finfos->empty()) {
                DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Cannot get Windows VST information from '%1'\n", path));
+               if (Config->get_verbose_plugin_scan()) {
+                       info << _(" -> Cannot get Windows VST information, plugin ignored.") << endmsg;
+               }
                return -1;
        }
 
@@ -729,7 +746,7 @@ PluginManager::windows_vst_discover (string path, bool cache_only)
                char buf[32];
 
                if (!finfo->canProcessReplacing) {
-                       warning << string_compose (_("VST plugin %1 does not support processReplacing, and so cannot be used in %2 at this time"),
+                       warning << string_compose (_("VST plugin %1 does not support processReplacing, and cannot be used in %2 at this time"),
                                                         finfo->name, PROGRAM_NAME)
                                << endl;
                        continue;
@@ -763,8 +780,8 @@ PluginManager::windows_vst_discover (string path, bool cache_only)
 
                if (!_windows_vst_plugin_info->empty()) {
                        for (PluginInfoList::iterator i =_windows_vst_plugin_info->begin(); i != _windows_vst_plugin_info->end(); ++i) {
-                               if ((info->type == (*i)->type)&&(info->unique_id == (*i)->unique_id)) {
-                                       warning << "Ignoring duplicate Windows VST plugin " << info->name << "\n";
+                               if ((info->type == (*i)->type) && (info->unique_id == (*i)->unique_id)) {
+                                       warning << string_compose (_("Ignoring duplicate Windows VST plugin \"%1\""), info->name) << endmsg;
                                        duplicate = true;
                                        break;
                                }
@@ -775,6 +792,9 @@ PluginManager::windows_vst_discover (string path, bool cache_only)
                        DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Windows VST plugin ID '%1'\n", info->unique_id));
                        _windows_vst_plugin_info->push_back (info);
                        discovered++;
+                       if (Config->get_verbose_plugin_scan()) {
+                               PBD::info << string_compose (_(" -> OK. (VST Plugin \"%1\" added)."), info->name) << endmsg; 
+                       }
                }
        }