diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:07:05 +0000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:07:05 +0000 |
commit | 306e6475e52e6a8fe308702520f61fbcd17c5ece (patch) | |
tree | 3c81ad61db7a8daa6100c54df3c92eddbab81234 /libs | |
parent | 0f482627a59f37ab9aa24a9ac757e69039467988 (diff) |
Replace use of PBD::sys::path in ardour/template_utils.h
some associated changes from not including pbd/filesystem.h in template_utils.h
git-svn-id: svn://localhost/ardour2/branches/3.0@12833 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/template_utils.h | 11 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 1 | ||||
-rw-r--r-- | libs/ardour/template_utils.cc | 20 |
3 files changed, 11 insertions, 21 deletions
diff --git a/libs/ardour/ardour/template_utils.h b/libs/ardour/ardour/template_utils.h index ec9fdaac8f..a61dbcf158 100644 --- a/libs/ardour/ardour/template_utils.h +++ b/libs/ardour/ardour/template_utils.h @@ -2,17 +2,16 @@ #ifndef TEMPLATE_UTILS_INCLUDED #define TEMPLATE_UTILS_INCLUDED +#include <string> #include <vector> -#include "pbd/filesystem.h" - namespace ARDOUR { - PBD::sys::path system_template_directory (); - PBD::sys::path system_route_template_directory (); + std::string system_template_directory (); + std::string system_route_template_directory (); - PBD::sys::path user_template_directory (); - PBD::sys::path user_route_template_directory (); + std::string user_template_directory (); + std::string user_route_template_directory (); struct TemplateInfo { std::string name; diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 3656e0f07e..c03be469cb 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -68,6 +68,7 @@ #include "pbd/controllable_descriptor.h" #include "pbd/enumwriter.h" #include "pbd/error.h" +#include "pbd/filesystem.h" #include "pbd/pathscanner.h" #include "pbd/pthread_utils.h" #include "pbd/search_path.h" diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc index 3e4797dac1..d0843b34cf 100644 --- a/libs/ardour/template_utils.cc +++ b/libs/ardour/template_utils.cc @@ -3,7 +3,6 @@ #include <glibmm.h> -#include "pbd/filesystem.h" #include "pbd/basename.h" #include "pbd/pathscanner.h" #include "pbd/xml++.h" @@ -35,22 +34,16 @@ route_template_search_path () return spath; } -sys::path +std::string user_template_directory () { - sys::path p(user_config_directory()); - p /= templates_dir_name; - - return p; + return Glib::build_filename (user_config_directory(), templates_dir_name); } -sys::path +std::string user_route_template_directory () { - sys::path p(user_config_directory()); - p /= route_templates_dir_name; - - return p; + return Glib::build_filename (user_config_directory(), route_templates_dir_name); } static bool @@ -76,10 +69,7 @@ route_template_filter (const string &str, void */*arg*/) string session_template_dir_to_file (string const & dir) { - sys::path dir_path = dir; - sys::path file_path = dir; - file_path /= dir_path.leaf() + template_suffix; - return file_path.to_string (); + return Glib::build_filename (dir, Glib::path_get_basename(dir) + template_suffix); } |