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

3 files changed, 7 insertions, 10 deletions

diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 6ae99302da..a33b01cbd9 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -2016,7 +2016,7 @@ LV2World::load_bundled_plugins()
 		cout << "Scanning folders for bundled LV2s: " << ARDOUR::lv2_bundled_search_path().to_string() << endl;
 
 		vector<string> plugin_objects;
-		find_files_matching_filter (plugin_objects, ARDOUR::lv2_bundled_search_path().to_string(), lv2_filter, 0, true, true);
+		find_files_matching_filter (plugin_objects, ARDOUR::lv2_bundled_search_path(), lv2_filter, 0, true, true);
 		for ( vector<string>::iterator x = plugin_objects.begin(); x != plugin_objects.end (); ++x) {
 #ifdef PLATFORM_WINDOWS
 			string uri = "file:///" + *x + "/";
diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index 3be16e4d48..906e979862 100644
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -91,11 +91,10 @@ void
 PannerManager::discover_panners ()
 {
 	std::vector<std::string> panner_modules;
-	std::string search_path = panner_search_path().to_string();
 
-	DEBUG_TRACE (DEBUG::Panning, string_compose (_("looking for panners in %1\n"), search_path));
+	DEBUG_TRACE (DEBUG::Panning, string_compose (_("looking for panners in %1\n"), panner_search_path().to_string()));
 
-	find_files_matching_filter (panner_modules, search_path, panner_filter, 0, false, true, true);
+	find_files_matching_filter (panner_modules, panner_search_path(), panner_filter, 0, false, true, true);
 
 	for (vector<std::string>::iterator i = panner_modules.begin(); i != panner_modules.end(); ++i) {
 		panner_discover (*i);
diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index 64f6ce75ab..f5a4dc78a6 100644
--- a/libs/ardour/template_utils.cc
+++ b/libs/ardour/template_utils.cc
@@ -82,16 +82,15 @@ void
 find_session_templates (vector<TemplateInfo>& template_names)
 {
 	vector<string> templates;
-	Searchpath spath (template_search_path());
 
-	find_files_matching_filter (templates, spath.to_string(), template_filter, 0, true, true);
+	find_files_matching_filter (templates, template_search_path(), template_filter, 0, true, true);
 
 	if (templates.empty()) {
-		cerr << "Found nothing along " << spath.to_string() << endl;
+		cerr << "Found nothing along " << template_search_path().to_string() << endl;
 		return;
 	}
 
-	cerr << "Found " << templates.size() << " along " << spath.to_string() << endl;
+	cerr << "Found " << templates.size() << " along " << template_search_path().to_string() << endl;
 
 	for (vector<string>::iterator i = templates.begin(); i != templates.end(); ++i) {
 		string file = session_template_dir_to_file (*i);
@@ -115,9 +114,8 @@ void
 find_route_templates (vector<TemplateInfo>& template_names)
 {
 	vector<string> templates;
-	Searchpath spath (route_template_search_path());
 
-	find_files_matching_filter (templates, spath.to_string(), route_template_filter, 0, false, true);
+	find_files_matching_filter (templates, route_template_search_path(), route_template_filter, 0, false, true);
 
 	if (templates.empty()) {
 		return;