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

Remove parameters from PBD::find_files_matching_regex

Browse source 
The only users of this API always used the same options so just remove
them.
This commit is contained in:
Tim Mayberry 2014-06-19 12:58:49 +10:00 • committed by Paul Davis
parent 769ee5c1f2
commit 0189ad7e29
3 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libs/ardour/plugin_manager.cc
View file

@ -242,7 +242,7 @@ PluginManager::clear_vst_cache ()
#ifdef WINDOWS_VST_SUPPORT #ifdef WINDOWS_VST_SUPPORT
{ {
vector<string> fsi_files; vector<string> fsi_files;
find_files_matching_regex (fsi_files, Config->get_plugin_path_vst(), "\\.fsi$", true, true, -1, false); find_files_matching_regex (fsi_files, Config->get_plugin_path_vst(), "\\.fsi$");
for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) { for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) {
::g_unlink(i->c_str()); ::g_unlink(i->c_str());
} }
@ -252,7 +252,7 @@ PluginManager::clear_vst_cache ()
#ifdef LXVST_SUPPORT #ifdef LXVST_SUPPORT
{ {
vector<string> fsi_files; vector<string> fsi_files;
find_files_matching_regex (fsi_files, Config->get_plugin_path_lxvst(), "\\.fsi$", true, true, -1, false); find_files_matching_regex (fsi_files, Config->get_plugin_path_lxvst(), "\\.fsi$");
for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) { for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) {
::g_unlink(i->c_str()); ::g_unlink(i->c_str());
} }
@ -263,7 +263,7 @@ PluginManager::clear_vst_cache ()
{ {
string personal = get_personal_vst_info_cache_dir(); string personal = get_personal_vst_info_cache_dir();
vector<string> fsi_files; vector<string> fsi_files;
find_files_matching_regex (fsi_files, personal, "\\.fsi$", true, true, -1, false); find_files_matching_regex (fsi_files, personal, "\\.fsi$");
for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) { for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) {
::g_unlink(i->c_str()); ::g_unlink(i->c_str());
} }
@ -277,7 +277,7 @@ PluginManager::clear_vst_blacklist ()
#ifdef WINDOWS_VST_SUPPORT #ifdef WINDOWS_VST_SUPPORT
{ {
vector<string> fsi_files; vector<string> fsi_files;
find_files_matching_regex (fsi_files, Config->get_plugin_path_vst(), "\\.fsb$", true, true, -1, false); find_files_matching_regex (fsi_files, Config->get_plugin_path_vst(), "\\.fsb$");
for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) { for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) {
::g_unlink(i->c_str()); ::g_unlink(i->c_str());
} }
@ -287,7 +287,7 @@ PluginManager::clear_vst_blacklist ()
#ifdef LXVST_SUPPORT #ifdef LXVST_SUPPORT
{ {
vector<string> fsi_files; vector<string> fsi_files;
find_files_matching_regex (fsi_files, Config->get_plugin_path_lxvst(), "\\.fsb$", true, true, -1, false); find_files_matching_regex (fsi_files, Config->get_plugin_path_lxvst(), "\\.fsb$");
for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) { for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) {
::g_unlink(i->c_str()); ::g_unlink(i->c_str());
} }
@ -299,7 +299,7 @@ PluginManager::clear_vst_blacklist ()
string personal = get_personal_vst_blacklist_dir(); string personal = get_personal_vst_blacklist_dir();
vector<string> fsi_files; vector<string> fsi_files;
find_files_matching_regex (fsi_files, personal, "\\.fsb$", true, true, -1, false); find_files_matching_regex (fsi_files, personal, "\\.fsb$");
for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) { for (vector<string>::iterator i = fsi_files.begin(); i != fsi_files.end (); ++i) {
::g_unlink(i->c_str()); ::g_unlink(i->c_str());
} }

8
libs/pbd/file_utils.cc
View file

@ -205,10 +205,7 @@ regexp_filter (const string& str, void *arg)
void void
find_files_matching_regex (vector<string>& result, find_files_matching_regex (vector<string>& result,
const std::string& dirpath, const std::string& dirpath,
const std::string& regexp, const std::string& regexp)
bool match_fullpath, bool return_fullpath,
long limit,
bool recurse)
{ {
int err; int err;
char msg[256]; char msg[256];
@ -230,8 +227,7 @@ find_files_matching_regex (vector<string>& result,
find_files_matching_filter (result, dirpath, find_files_matching_filter (result, dirpath,
regexp_filter, &compiled_pattern, regexp_filter, &compiled_pattern,
match_fullpath, return_fullpath, true, true, -1, false);
limit, recurse);
regfree (&compiled_pattern); regfree (&compiled_pattern);
} }

6
libs/pbd/pbd/file_utils.h
View file

@ -115,11 +115,7 @@ find_file_in_search_path (const Searchpath& search_path,
LIBPBD_API void LIBPBD_API void
find_files_matching_regex (std::vector<std::string>& results, find_files_matching_regex (std::vector<std::string>& results,
const std::string& dirpath, const std::string& dirpath,
const std::string& regexp, const std::string& regexp);
bool match_fullpath,
bool return_fullpath,
long limit = -1,
bool recurse = false);
/** /**
* @return files in dirpath that match a supplied filter(functor) * @return files in dirpath that match a supplied filter(functor)