smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

VST3: fix manual black/whitelist

Browse source
This commit is contained in:
Robin Gareus 2021-07-07 18:35:11 +02:00
parent b27bb586d0
commit d0177846dd
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

48
libs/ardour/plugin_manager.cc
View file

@ -1841,8 +1841,27 @@ PluginManager::clear_vst3_blacklist ()
#ifdef VST3_SUPPORT #ifdef VST3_SUPPORT
static bool vst3_is_blacklisted (string const& module_path)
{
string fn = Glib::build_filename (ARDOUR::user_cache_directory (), VST3_BLACKLIST);
if (!Glib::file_test (fn, Glib::FILE_TEST_EXISTS)) {
return false;
}
std::string bl;
try {
bl = Glib::file_get_contents (fn);
} catch (Glib::FileError const& err) {
return false;
}
return bl.find (module_path + "\n") != string::npos;
}
static void vst3_blacklist (string const& module_path) static void vst3_blacklist (string const& module_path)
{ {
if (module_path.empty () || vst3_is_blacklisted (module_path)) {
return;
}
string fn = Glib::build_filename (ARDOUR::user_cache_directory (), VST3_BLACKLIST); string fn = Glib::build_filename (ARDOUR::user_cache_directory (), VST3_BLACKLIST);
FILE* f = NULL; FILE* f = NULL;
if (! (f = g_fopen (fn.c_str (), "a"))) { if (! (f = g_fopen (fn.c_str (), "a"))) {
@ -1855,6 +1874,10 @@ static void vst3_blacklist (string const& module_path)
static void vst3_whitelist (string module_path) static void vst3_whitelist (string module_path)
{ {
if (module_path.empty ()) {
return;
}
string fn = Glib::build_filename (ARDOUR::user_cache_directory (), VST3_BLACKLIST); string fn = Glib::build_filename (ARDOUR::user_cache_directory (), VST3_BLACKLIST);
if (!Glib::file_test (fn, Glib::FILE_TEST_EXISTS)) { if (!Glib::file_test (fn, Glib::FILE_TEST_EXISTS)) {
return; return;
@ -1879,22 +1902,6 @@ static void vst3_whitelist (string module_path)
Glib::file_set_contents (fn, bl); Glib::file_set_contents (fn, bl);
} }
static bool vst3_is_blacklisted (string const& module_path)
{
string fn = Glib::build_filename (ARDOUR::user_cache_directory (), VST3_BLACKLIST);
if (!Glib::file_test (fn, Glib::FILE_TEST_EXISTS)) {
return false;
}
std::string bl;
try {
bl = Glib::file_get_contents (fn);
} catch (Glib::FileError const& err) {
return false;
}
return bl.find (module_path + "\n") != string::npos;
}
static bool vst3_filter (const string& str, void*) static bool vst3_filter (const string& str, void*)
{ {
return str[0] != '.' && (str.length() > 4 && str.find (".vst3") == (str.length() - 5)); return str[0] != '.' && (str.length() > 4 && str.find (".vst3") == (str.length() - 5));
@ -2921,7 +2928,7 @@ PluginManager::blacklist (ARDOUR::PluginType type, std::string const& path_uid)
break; break;
case VST3: case VST3:
#ifdef VST3_SUPPORT #ifdef VST3_SUPPORT
vst3_blacklist (path_uid); vst3_blacklist (module_path_vst3 (path_uid));
pil = _vst3_plugin_info; pil = _vst3_plugin_info;
#endif #endif
break; break;
@ -2983,7 +2990,7 @@ PluginManager::whitelist (ARDOUR::PluginType type, std::string const& path_uid,
break; break;
case VST3: case VST3:
#ifdef VST3_SUPPORT #ifdef VST3_SUPPORT
vst3_whitelist (path_uid); vst3_whitelist (module_path_vst3 (path_uid));
return true; return true;
#endif #endif
break; break;
@ -3016,7 +3023,7 @@ PluginManager::cache_file (ARDOUR::PluginType type, std::string const& path_uid)
break; break;
case VST3: case VST3:
#ifdef VST3_SUPPORT #ifdef VST3_SUPPORT
fn = ARDOUR::vst3_cache_file (path_uid); fn = ARDOUR::vst3_cache_file (module_path_vst3 (path_uid));
#endif #endif
break; break;
default: default:
@ -3076,6 +3083,7 @@ PluginManager::rescan_plugin (ARDOUR::PluginType type, std::string const& path_u
} }
erased = true; erased = true;
} }
_plugin_scan_log.erase (i);
} }
if (den < 2) { if (den < 2) {
@ -3087,7 +3095,7 @@ PluginManager::rescan_plugin (ARDOUR::PluginType type, std::string const& path_u
_cancel_scan_timeout = false; _cancel_scan_timeout = false;
/* force re-scan, remove cache file */ /* force re-scan, remove cache file */
std::string fn = cache_file ((*i)->type (), (*i)->path ()); std::string fn = cache_file (type, path_uid);
if (!fn.empty ()) { if (!fn.empty ()) {
::g_unlink (fn.c_str ()); ::g_unlink (fn.c_str ());
} }