ardour/livetrax
13
0
Fork 0
Code

Use ARDOUR::system_data_search_path instead of get_system_data_path in ARDOUR::system_template_directory

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@2066 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-06-27 12:12:51 +00:00
parent 7af4e87fa9
commit 66caf9b7e5
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/ardour/template_utils.cc
View File

@ -1,8 +1,9 @@
#include <algorithm>
#include <pbd/filesystem.h>
#include <pbd/error.h>
#include <ardour/template_utils.h>
#include <ardour/ardour.h>
#include <ardour/directory_names.h>
#include <ardour/filesystem_paths.h>
@ -11,10 +12,19 @@ namespace ARDOUR {
sys::path
system_template_directory ()
{
sys::path p(get_system_data_path());
p /= templates_dir_name;
SearchPath spath(system_data_search_path());
spath.add_subdirectory_to_paths(templates_dir_name);
return p;
// 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())
{
warning << "System template directory does not exist" << endmsg;
return sys::path("");
}
return *i;
}
sys::path