summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libs/ardour/audioengine.cc14
-rw-r--r--libs/ardour/control_protocol_manager.cc12
-rw-r--r--libs/ardour/export_profile_manager.cc3
-rw-r--r--libs/ardour/globals.cc6
-rw-r--r--libs/ardour/midi_patch_manager.cc6
-rw-r--r--libs/ardour/plugin_manager.cc15
-rw-r--r--libs/ardour/session_state_utils.cc6
-rw-r--r--libs/backends/jack/jack_utils.cc3
-rw-r--r--libs/midi++2/test/MidnamTest.cpp2
-rw-r--r--libs/pbd/file_utils.cc27
-rw-r--r--libs/pbd/pbd/file_utils.h39
11 files changed, 26 insertions, 107 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 8612f44b8a..6c9fd442fb 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -506,15 +506,15 @@ AudioEngine::discover_backends ()
#else
Glib::PatternSpec dll_extension_pattern("*backend.dll");
#endif
-
- find_matching_files_in_search_path (backend_search_path (),
- so_extension_pattern, backend_modules);
- find_matching_files_in_search_path (backend_search_path (),
- dylib_extension_pattern, backend_modules);
+ find_files_matching_pattern (backend_modules, backend_search_path (),
+ so_extension_pattern);
+
+ find_files_matching_pattern (backend_modules, backend_search_path (),
+ dylib_extension_pattern);
- find_matching_files_in_search_path (backend_search_path (),
- dll_extension_pattern, backend_modules);
+ find_files_matching_pattern (backend_modules, backend_search_path (),
+ dll_extension_pattern);
DEBUG_TRACE (DEBUG::AudioEngine, string_compose ("looking for backends in %1\n", backend_search_path().to_string()));
diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 49b3d07761..fdac48e731 100644
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -268,14 +268,14 @@ ControlProtocolManager::discover_control_protocols ()
Glib::PatternSpec so_extension_pattern("*.so");
Glib::PatternSpec dylib_extension_pattern("*.dylib");
- find_matching_files_in_search_path (control_protocol_search_path (),
- dll_extension_pattern, cp_modules);
+ find_files_matching_pattern (cp_modules, control_protocol_search_path (),
+ dll_extension_pattern);
- find_matching_files_in_search_path (control_protocol_search_path (),
- so_extension_pattern, cp_modules);
+ find_files_matching_pattern (cp_modules, control_protocol_search_path (),
+ so_extension_pattern);
- find_matching_files_in_search_path (control_protocol_search_path (),
- dylib_extension_pattern, cp_modules);
+ find_files_matching_pattern (cp_modules, control_protocol_search_path (),
+ dylib_extension_pattern);
DEBUG_TRACE (DEBUG::ControlProtocols,
string_compose (_("looking for control protocols in %1\n"), control_protocol_search_path().to_string()));
diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc
index 0792232b5f..4a10d3dfa8 100644
--- a/libs/ardour/export_profile_manager.cc
+++ b/libs/ardour/export_profile_manager.cc
@@ -332,8 +332,7 @@ ExportProfileManager::find_file (std::string const & pattern)
{
vector<std::string> found;
- Glib::PatternSpec pattern_spec (pattern);
- find_matching_files_in_search_path (search_path, pattern_spec, found);
+ find_files_matching_pattern (found, search_path, pattern);
return found;
}
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 054ffffe51..ed62420ff0 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -404,11 +404,9 @@ ARDOUR::find_bindings_files (map<string,string>& files)
Searchpath spath = ardour_config_search_path();
if (getenv ("ARDOUR_SAE")) {
- Glib::PatternSpec pattern("*SAE-*.bindings");
- find_matching_files_in_search_path (spath, pattern, found);
+ find_files_matching_pattern (found, spath, "*SAE-*.bindings");
} else {
- Glib::PatternSpec pattern("*.bindings");
- find_matching_files_in_search_path (spath, pattern, found);
+ find_files_matching_pattern (found, spath, "*.bindings");
}
if (found.empty()) {
diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index 4587b1aad9..591c0cae40 100644
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -68,10 +68,9 @@ MidiPatchManager::add_session_patches ()
assert (Glib::file_test (path_to_patches, Glib::FILE_TEST_IS_DIR));
- Glib::PatternSpec pattern(string("*.midnam"));
vector<std::string> result;
- find_matching_files_in_directory (path_to_patches, pattern, result);
+ find_files_matching_pattern (result, path_to_patches, "*.midnam");
info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
@@ -104,10 +103,9 @@ MidiPatchManager::refresh()
_all_models.clear();
Searchpath search_path = midi_patch_search_path ();
- Glib::PatternSpec pattern (string("*.midnam"));
vector<std::string> result;
- find_matching_files_in_search_path (search_path, pattern, result);
+ find_files_matching_pattern (result, search_path, "*.midnam");
info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg;
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 0684009935..5c809c213b 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -326,18 +326,9 @@ PluginManager::ladspa_refresh ()
DEBUG_TRACE (DEBUG::PluginManager, string_compose ("LADSPA: search along: [%1]\n", ladspa_search_path().to_string()));
- Glib::PatternSpec so_extension_pattern("*.so");
- Glib::PatternSpec dylib_extension_pattern("*.dylib");
- Glib::PatternSpec dll_extension_pattern("*.dll");
-
- find_matching_files_in_search_path (ladspa_search_path (),
- so_extension_pattern, ladspa_modules);
-
- find_matching_files_in_search_path (ladspa_search_path (),
- dylib_extension_pattern, ladspa_modules);
-
- find_matching_files_in_search_path (ladspa_search_path (),
- dll_extension_pattern, ladspa_modules);
+ find_files_matching_pattern (ladspa_modules, ladspa_search_path (), "*.so");
+ find_files_matching_pattern (ladspa_modules, ladspa_search_path (), "*.dylib");
+ find_files_matching_pattern (ladspa_modules, ladspa_search_path (), "*.dll");
for (vector<std::string>::iterator i = ladspa_modules.begin(); i != ladspa_modules.end(); ++i) {
ARDOUR::PluginScanMessage(_("LADSPA"), *i, false);
diff --git a/libs/ardour/session_state_utils.cc b/libs/ardour/session_state_utils.cc
index 13d65e5b3c..5d5c9cc8df 100644
--- a/libs/ardour/session_state_utils.cc
+++ b/libs/ardour/session_state_utils.cc
@@ -47,10 +47,8 @@ void
get_state_files_in_directory (const std::string & directory_path,
vector<std::string> & result)
{
- Glib::PatternSpec state_file_pattern('*' + string(statefile_suffix));
-
- find_matching_files_in_directory (directory_path, state_file_pattern,
- result);
+ find_files_matching_pattern (result, directory_path,
+ '*' + string(statefile_suffix));
}
vector<string>
diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc
index 3bb06ee4e8..8bbfab5cf1 100644
--- a/libs/backends/jack/jack_utils.cc
+++ b/libs/backends/jack/jack_utils.cc
@@ -616,8 +616,7 @@ ARDOUR::get_jack_server_paths (const vector<std::string>& server_dir_paths,
vector<std::string>& server_paths)
{
for (vector<string>::const_iterator i = server_names.begin(); i != server_names.end(); ++i) {
- Glib::PatternSpec ps (*i);
- find_matching_files_in_directories (server_dir_paths, ps, server_paths);
+ find_files_matching_pattern (server_paths, server_dir_paths, *i);
}
return !server_paths.empty();
}
diff --git a/libs/midi++2/test/MidnamTest.cpp b/libs/midi++2/test/MidnamTest.cpp
index d8c89eb011..52bf988e9b 100644
--- a/libs/midi++2/test/MidnamTest.cpp
+++ b/libs/midi++2/test/MidnamTest.cpp
@@ -160,7 +160,7 @@ MidnamTest::load_all_midnams_test ()
Glib::PatternSpec pattern(string("*.midnam"));
vector<std::string> result;
- PBD::find_matching_files_in_directory (prefix, pattern, result);
+ PBD::find_files_matching_pattern (result, prefix, pattern);
cout << "Loading " << result.size() << " MIDI patches from " << prefix << endl;
diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index 98c8a6fcfc..bc4ad8ee6d 100644
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -146,39 +146,14 @@ find_files_matching_pattern (vector<string>& result,
find_files_matching_pattern (result, paths, tmp);
}
-void
-find_matching_files_in_directory (const std::string& directory,
- const Glib::PatternSpec& pattern,
- vector<std::string>& result)
-{
- find_files_matching_pattern (result, directory, pattern);
-}
-
-void
-find_matching_files_in_directories (const vector<std::string>& paths,
- const Glib::PatternSpec& pattern,
- vector<std::string>& result)
-{
- find_files_matching_pattern (result, paths, pattern);
-}
-
-void
-find_matching_files_in_search_path (const Searchpath& search_path,
- const Glib::PatternSpec& pattern,
- vector<std::string>& result)
-{
- find_files_matching_pattern (result, search_path, pattern);
-}
-
bool
find_file_in_search_path(const Searchpath& search_path,
const string& filename,
std::string& result)
{
vector<std::string> tmp;
- Glib::PatternSpec tmp_pattern(filename);
- find_matching_files_in_search_path (search_path, tmp_pattern, tmp);
+ find_files_matching_pattern (tmp, search_path, filename);
if (tmp.size() == 0)
{
diff --git a/libs/pbd/pbd/file_utils.h b/libs/pbd/pbd/file_utils.h
index 588e48217a..8fef0c4d45 100644
--- a/libs/pbd/pbd/file_utils.h
+++ b/libs/pbd/pbd/file_utils.h
@@ -90,45 +90,6 @@ find_files_matching_pattern (std::vector<std::string>& result,
const std::string& pattern);
/**
- * Takes a directory path and returns all the files in the directory
- * matching a particular pattern.
- *
- * @param directory A directory path
- * @param pattern A Glib::PatternSpec used to match the files.
- * @param result A vector in which to place the resulting matches.
- */
-LIBPBD_API void
-find_matching_files_in_directory (const std::string& directory,
- const Glib::PatternSpec& pattern,
- std::vector<std::string>& result);
-
-/**
- * Takes a number of directory paths and returns all the files matching
- * a particular pattern.
- *
- * @param paths A vector containing the Absolute paths
- * @param pattern A Glib::PatternSpec used to match the files
- * @param result A vector in which to place the resulting matches.
- */
-LIBPBD_API void
-find_matching_files_in_directories (const std::vector<std::string>& directory_paths,
- const Glib::PatternSpec& pattern,
- std::vector<std::string>& result);
-
-/**
- * Takes a Searchpath and puts a list of all the files in the search path
- * that match pattern into the result vector.
- *
- * @param search_path A Searchpath
- * @param pattern A Glib::PatternSpec used to match the files
- * @param result A vector in which to place the resulting matches.
- */
-LIBPBD_API void
-find_matching_files_in_search_path (const Searchpath& search_path,
- const Glib::PatternSpec& pattern,
- std::vector<std::string>& result);
-
-/**
* Takes a search path and a file name and place the full path
* to that file in result if it is found within the search path.
*
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 03:44:05 +0000