Enums are not Classes in C++98

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

diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index f5a4dc78a6bcd1384666f774408da68e3d192a6b..b2fa703060b7ca56e3473dd51184d14d6f023ab1 100644 (file)
--- a/libs/ardour/template_utils.cc
+++ b/libs/ardour/template_utils.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    Copyright (C) 2012 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ template_filter (const string &str, void* /*arg*/)
        if (!Glib::file_test (str, Glib::FILE_TEST_IS_DIR)) {
                return false;
        }
-       
+
        return true;
 }
 
@@ -67,7 +67,7 @@ route_template_filter (const string &str, void* /*arg*/)
        if (str.find (template_suffix) == str.length() - strlen (template_suffix)) {
                return true;
        }
-       
+
        return false;
 }
 
@@ -79,11 +79,11 @@ session_template_dir_to_file (string const & dir)
 
 
 void
-find_session_templates (vector<TemplateInfo>& template_names)
+find_session_templates (vector<TemplateInfo>& template_names, bool read_xml)
 {
        vector<string> templates;
 
-       find_files_matching_filter (templates, template_search_path(), template_filter, 0, true, true);
+       find_paths_matching_filter (templates, template_search_path(), template_filter, 0, true, true);
 
        if (templates.empty()) {
                cerr << "Found nothing along " << template_search_path().to_string() << endl;
@@ -95,10 +95,11 @@ find_session_templates (vector<TemplateInfo>& template_names)
        for (vector<string>::iterator i = templates.begin(); i != templates.end(); ++i) {
                string file = session_template_dir_to_file (*i);
 
-               XMLTree tree;
-
-               if (!tree.read (file.c_str())) {
-                       continue;
+               if (read_xml) {
+                       XMLTree tree;
+                       if (!tree.read (file.c_str())) {
+                               continue;
+                       }
                }
 
                TemplateInfo rti;