ardour/livetrax
13
0
Fork 0
Code

macVST: prevent endless recursive scans

Browse Source
This commit is contained in:
Robin Gareus 2024-09-06 20:00:36 +02:00
parent 00f6468606
commit 9e469ad030
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/plugin_manager.h
View File

@ -343,7 +343,7 @@ private:
void lv2_refresh ();
int windows_vst_discover_from_path (std::string path, bool cache_only = false);
int mac_vst_discover_from_path (std::string path, bool cache_only = false);
int mac_vst_discover_from_path (std::string path, std::set<std::string>&, bool cache_only = false);
int lxvst_discover_from_path (std::string path, bool cache_only = false);
#if (defined WINDOWS_VST_SUPPORT || defined MACVST_SUPPORT || defined LXVST_SUPPORT)
bool vst2_plugin (std::string const& module_path, ARDOUR::PluginType, VST2Info const&);

12
libs/ardour/plugin_manager.cc
View File

@ -1801,13 +1801,14 @@ PluginManager::windows_vst_discover_from_path (string path, bool cache_only)
void
PluginManager::mac_vst_refresh (bool cache_only)
{
std::set<std::string> scanned_paths;
if (_mac_vst_plugin_info) {
_mac_vst_plugin_info->clear ();
} else {
_mac_vst_plugin_info = new ARDOUR::PluginInfoList();
}
mac_vst_discover_from_path ("~/Library/Audio/Plug-Ins/VST:/Library/Audio/Plug-Ins/VST", cache_only);
mac_vst_discover_from_path ("~/Library/Audio/Plug-Ins/VST:/Library/Audio/Plug-Ins/VST", scanned_paths, cache_only);
if (!cache_only) {
/* ensure that VST path is flushed to disk */
Config->save_state();
@ -1824,7 +1825,7 @@ static bool mac_vst_filter (const string& str)
}
int
PluginManager::mac_vst_discover_from_path (string path, bool cache_only)
PluginManager::mac_vst_discover_from_path (string path, std::set<std::string>& scanned_paths, bool cache_only)
{
vector<string> plugin_objects;
vector<string>::iterator x;
@ -1834,6 +1835,11 @@ PluginManager::mac_vst_discover_from_path (string path, bool cache_only)
return -1;
}
if (scanned_paths.find (path) != scanned_paths::end) {
return 0;
}
scanned_paths.insert (path);
Searchpath paths (path);
/* customized version of run_functor_for_paths() */
for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
@ -1860,7 +1866,7 @@ PluginManager::mac_vst_discover_from_path (string path, bool cache_only)
}
/* recurse */
mac_vst_discover_from_path (fullpath, cache_only);
mac_vst_discover_from_path (fullpath, scanned_paths, cache_only);
}
} catch (Glib::FileError& err) { }
}