merge with master and fix 4 conflicts by hand

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

diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc
index 09227f6347a84e90e70c6714177bd4a9d5da4d11..0efcce6451b5b61763557315e1b8b3282976ce45 100644 (file)
--- a/libs/ardour/search_paths.cc
+++ b/libs/ardour/search_paths.cc
@@ -147,6 +147,22 @@ panner_search_path ()
        return spath;
 }
 
+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;
+}
+
 #ifdef PLATFORM_WINDOWS
 
 const char*