projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix crash when copy'ing latent plugins
[ardour.git]
/
libs
/
ardour
/
template_utils.cc
diff --git
a/libs/ardour/template_utils.cc
b/libs/ardour/template_utils.cc
index 8efe3115366594cbebc75d0de974a13b1b07fc80..7797440f0e0a1720e52108e221196ccbcf313422 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
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
@@
-23,7
+23,8
@@
#include <glibmm.h>
#include "pbd/basename.h"
#include <glibmm.h>
#include "pbd/basename.h"
-#include "pbd/pathscanner.h"
+#include "pbd/file_utils.h"
+#include "pbd/stl_delete.h"
#include "pbd/xml++.h"
#include "ardour/template_utils.h"
#include "pbd/xml++.h"
#include "ardour/template_utils.h"
@@
-56,7
+57,7
@@
template_filter (const string &str, void* /*arg*/)
if (!Glib::file_test (str, Glib::FILE_TEST_IS_DIR)) {
return false;
}
if (!Glib::file_test (str, Glib::FILE_TEST_IS_DIR)) {
return false;
}
-
+
return true;
}
return true;
}
@@
-66,7
+67,7
@@
route_template_filter (const string &str, void* /*arg*/)
if (str.find (template_suffix) == str.length() - strlen (template_suffix)) {
return true;
}
if (str.find (template_suffix) == str.length() - strlen (template_suffix)) {
return true;
}
-
+
return false;
}
return false;
}
@@
-80,21
+81,19
@@
session_template_dir_to_file (string const & dir)
void
find_session_templates (vector<TemplateInfo>& template_names)
{
void
find_session_templates (vector<TemplateInfo>& template_names)
{
- vector<string *> *templates;
- PathScanner scanner;
- Searchpath spath (template_search_path());
+ vector<string> templates;
-
templates = scanner (spath.to_string
(), template_filter, 0, true, true);
+
find_paths_matching_filter (templates, template_search_path
(), template_filter, 0, true, true);
- if (
!templates
) {
- cerr << "Found nothing along " <<
spath
.to_string() << endl;
+ if (
templates.empty()
) {
+ cerr << "Found nothing along " <<
template_search_path()
.to_string() << endl;
return;
}
return;
}
- cerr << "Found " << templates
->size() << " along " << spath
.to_string() << endl;
+ cerr << "Found " << templates
.size() << " along " << template_search_path()
.to_string() << endl;
- for (vector<string
*>::iterator i = templates->begin(); i != templates->
end(); ++i) {
- string file = session_template_dir_to_file (*
*
i);
+ for (vector<string
>::iterator i = templates.begin(); i != templates.
end(); ++i) {
+ string file = session_template_dir_to_file (*i);
XMLTree tree;
XMLTree tree;
@@
-104,30
+103,26
@@
find_session_templates (vector<TemplateInfo>& template_names)
TemplateInfo rti;
TemplateInfo rti;
- rti.name = basename_nosuffix (*
*
i);
- rti.path = *
*
i;
+ rti.name = basename_nosuffix (*i);
+ rti.path = *i;
template_names.push_back (rti);
}
template_names.push_back (rti);
}
-
- delete templates;
}
void
find_route_templates (vector<TemplateInfo>& template_names)
{
}
void
find_route_templates (vector<TemplateInfo>& template_names)
{
- vector<string *> *templates;
- PathScanner scanner;
- Searchpath spath (route_template_search_path());
+ vector<string> templates;
-
templates = scanner (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
) {
+ if (
templates.empty()
) {
return;
}
return;
}
- for (vector<string
*>::iterator i = templates->begin(); i != templates->
end(); ++i) {
- string fullpath = *
(*i)
;
+ for (vector<string
>::iterator i = templates.begin(); i != templates.
end(); ++i) {
+ string fullpath = *
i
;
XMLTree tree;
XMLTree tree;
@@
-144,8
+139,6
@@
find_route_templates (vector<TemplateInfo>& template_names)
template_names.push_back (rti);
}
template_names.push_back (rti);
}
-
- delete templates;
}
}
}
}