fix errors in manual conflict resolution

[ardour.git] / libs / ardour / template_utils.cc

diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index faecdc6e6339bea1c9b17eeef93eb0dfb13c10e9..8efe3115366594cbebc75d0de974a13b1b07fc80 100644 (file)
--- a/libs/ardour/template_utils.cc
+++ b/libs/ardour/template_utils.cc
@@ -30,33 +30,14 @@
 #include "ardour/directory_names.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/filename_extensions.h"
+#include "ardour/search_paths.h"
 #include "ardour/io.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 using namespace std;
 using namespace PBD;
 
 namespace ARDOUR {
 
-SearchPath
-template_search_path ()
-{
-       SearchPath spath (ardour_data_search_path());
-       spath.add_subdirectory_to_paths(templates_dir_name);
-       return spath;
-}
-
-SearchPath
-route_template_search_path ()
-{
-       SearchPath spath (ardour_data_search_path());
-       spath.add_subdirectory_to_paths(route_templates_dir_name);
-       return spath;
-}
-
 std::string
 user_template_directory ()
 {
@@ -101,7 +82,7 @@ find_session_templates (vector<TemplateInfo>& template_names)
 {
        vector<string *> *templates;
        PathScanner scanner;
-       SearchPath spath (template_search_path());
+       Searchpath spath (template_search_path());
 
        templates = scanner (spath.to_string(), template_filter, 0, true, true);
 
@@ -137,7 +118,7 @@ find_route_templates (vector<TemplateInfo>& template_names)
 {
        vector<string *> *templates;
        PathScanner scanner;
-       SearchPath spath (route_template_search_path());
+       Searchpath spath (route_template_search_path());
 
        templates = scanner (spath.to_string(), route_template_filter, 0, false, true);