From 105caf23daf5aed16c7ee8b904fcca2ddbd4f59f Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 23 Jun 2012 05:06:54 +0000 Subject: 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 --- libs/ardour/globals.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libs/ardour/globals.cc') 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& files) { - vector found; + vector found; SearchPath spath = ardour_config_search_path(); if (getenv ("ARDOUR_SAE")) { @@ -371,8 +372,8 @@ ARDOUR::find_bindings_files (map& files) return; } - for (vector::iterator x = found.begin(); x != found.end(); ++x) { - sys::path path = *x; + for (vector::iterator x = found.begin(); x != found.end(); ++x) { + sys::path path(*x); pair 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 -- cgit v1.2.3