smooth 0.5 second fade out during quit, plus MIDI panic to turn everything off (someo...

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

diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index 825a24d3e10a39406414899186f9ecc9a81dbd36..3e4797dac1de8bbf361a531f07c11709e5481f4c 100644 (file)
--- a/libs/ardour/template_utils.cc
+++ b/libs/ardour/template_utils.cc
@@ -19,32 +19,20 @@ using namespace PBD;
 
 namespace ARDOUR {
 
-sys::path
-system_template_directory ()
+SearchPath
+template_search_path ()
 {
-       SearchPath spath(system_data_search_path());
+       SearchPath spath (ardour_data_search_path());
        spath.add_subdirectory_to_paths(templates_dir_name);
-
-       // just return the first directory in the search path that exists
-       SearchPath::const_iterator i = std::find_if(spath.begin(), spath.end(), sys::exists);
-
-       if (i == spath.end()) return sys::path();
-
-       return *i;
+       return spath;
 }
 
-sys::path
-system_route_template_directory ()
+SearchPath
+route_template_search_path ()
 {
-       SearchPath spath(system_data_search_path());
+       SearchPath spath (ardour_data_search_path());
        spath.add_subdirectory_to_paths(route_templates_dir_name);
-
-       // just return the first directory in the search path that exists
-       SearchPath::const_iterator i = std::find_if(spath.begin(), spath.end(), sys::exists);
-
-       if (i == spath.end()) return sys::path();
-
-       return *i;
+       return spath;
 }
 
 sys::path
@@ -61,7 +49,7 @@ user_route_template_directory ()
 {
        sys::path p(user_config_directory());
        p /= route_templates_dir_name;
-
+       
        return p;
 }
 
@@ -75,6 +63,16 @@ template_filter (const string &str, void */*arg*/)
        return true;
 }
 
+static bool
+route_template_filter (const string &str, void */*arg*/)
+{
+       if (str.find (template_suffix) == str.length() - strlen (template_suffix)) {
+               return true;
+       }
+       
+       return false;
+}
+
 string
 session_template_dir_to_file (string const & dir)
 {
@@ -90,8 +88,7 @@ find_session_templates (vector<TemplateInfo>& template_names)
 {
        vector<string *> *templates;
        PathScanner scanner;
-       SearchPath spath (system_template_directory());
-       spath += user_template_directory ();
+       SearchPath spath (template_search_path());
 
        templates = scanner (spath.to_string(), template_filter, 0, true, true);
 
@@ -127,10 +124,9 @@ find_route_templates (vector<TemplateInfo>& template_names)
 {
        vector<string *> *templates;
        PathScanner scanner;
-       SearchPath spath (system_route_template_directory());
-       spath += user_route_template_directory ();
+       SearchPath spath (route_template_search_path());
 
-       templates = scanner (spath.to_string(), template_filter, 0, false, true);
+       templates = scanner (spath.to_string(), route_template_filter, 0, false, true);
 
        if (!templates) {
                return;