diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
| commit | 105caf23daf5aed16c7ee8b904fcca2ddbd4f59f (patch) | |
| tree | 4d74f6c8722790e6fb9d58888ea225866fc98d3c /libs/ardour/globals.cc | |
| parent | 22e478e7fc4952dd386391e85d8e7fa2491ae953 (diff) | |
Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h
git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/globals.cc')
| -rw-r--r-- | libs/ardour/globals.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 1c6b98155c..5cd52b67c0 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -56,6 +56,7 @@ #include "pbd/fpu.h" #include "pbd/file_utils.h" #include "pbd/enumwriter.h" +#include "pbd/filesystem.h" #include "midi++/port.h" #include "midi++/manager.h" @@ -356,7 +357,7 @@ ARDOUR::cleanup () void ARDOUR::find_bindings_files (map<string,string>& files) { - vector<sys::path> found; + vector<std::string> found; SearchPath spath = ardour_config_search_path(); if (getenv ("ARDOUR_SAE")) { @@ -371,8 +372,8 @@ ARDOUR::find_bindings_files (map<string,string>& files) return; } - for (vector<sys::path>::iterator x = found.begin(); x != found.end(); ++x) { - sys::path path = *x; + for (vector<std::string>::iterator x = found.begin(); x != found.end(); ++x) { + sys::path path(*x); pair<string,string> namepath; namepath.second = path.to_string(); namepath.first = path.leaf().substr (0, path.leaf().find_first_of ('.')); @@ -453,7 +454,7 @@ ARDOUR::setup_fpu () string ARDOUR::translation_kill_path () { - return Glib::build_filename (user_config_directory().to_string(), ".love_is_the_language_of_audio"); + return Glib::build_filename (user_config_directory(), ".love_is_the_language_of_audio"); } bool |