From d9a7d419b2858f5a2ce36ae5321c998d766be026 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Thu, 19 Jun 2014 18:26:17 +1000 Subject: Change PBD::find_files_matching_regex and PBD::find_files_matching_filter to take a Searchpath --- libs/ardour/template_utils.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libs/ardour/template_utils.cc') 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& template_names) { vector 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::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& template_names) { vector 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; -- cgit v1.2.3