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

Change PBD::find_files_matching_regex and PBD::find_files_matching_filter to take a Searchpath

Browse source
This commit is contained in:
Tim Mayberry 2014-06-19 18:26:17 +10:00 • committed by Paul Davis
parent 613162df6b
commit d9a7d419b2
8 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/pbd/file_utils.cc
View file

@ -203,7 +203,7 @@ regexp_filter (const string& str, void *arg)
void
find_files_matching_regex (vector<string>& result,
const std::string& dirpath,
const Searchpath& paths,
const std::string& regexp)
{
int err;
@ -224,7 +224,7 @@ find_files_matching_regex (vector<string>& result,
return;
}
find_files_matching_filter (result, dirpath,
find_files_matching_filter (result, paths,
regexp_filter, &compiled_pattern,
true, true, false);
@ -233,7 +233,7 @@ find_files_matching_regex (vector<string>& result,
void
find_files_matching_filter (vector<string>& result,
const string &dirpath,
const Searchpath& paths,
bool (*filter)(const string &, void *),
void *arg,
bool match_fullpath, bool return_fullpath,
@ -241,10 +241,7 @@ find_files_matching_filter (vector<string>& result,
{
vector<string> all_files;
Searchpath spath(dirpath);
for (vector<string>::iterator i = spath.begin(); i != spath.end(); ++i)
{
for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
string expanded_path = path_expand (*i);
get_directory_contents (expanded_path, all_files, true, recurse);
}