ardour/livetrax
13
0
Fork 0
Code

Use std::string instead of PBD::sys::path in Session::restore_history

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12894 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2012-06-23 05:09:26 +00:00
parent e37a65dade
commit dbd5a4e002
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/ardour/session_state.cc
View File

@ -3296,20 +3296,20 @@ Session::restore_history (string snapshot_name)
snapshot_name = _current_snapshot_name;
}
const string xml_filename = legalize_for_path (snapshot_name) + history_suffix;
const sys::path xml_path(Glib::build_filename (_session_dir->root_path(), xml_filename));
const std::string xml_filename = legalize_for_path (snapshot_name) + history_suffix;
const std::string xml_path(Glib::build_filename (_session_dir->root_path(), xml_filename));
info << "Loading history from " << xml_path.to_string() << endmsg;
info << "Loading history from " << xml_path << endmsg;
if (!Glib::file_test (xml_path.to_string(), Glib::FILE_TEST_EXISTS)) {
if (!Glib::file_test (xml_path, Glib::FILE_TEST_EXISTS)) {
info << string_compose (_("%1: no history file \"%2\" for this session."),
_name, xml_path.to_string()) << endmsg;
_name, xml_path) << endmsg;
return 1;
}
if (!tree.read (xml_path.to_string())) {
if (!tree.read (xml_path)) {
error << string_compose (_("Could not understand session history file \"%1\""),
xml_path.to_string()) << endmsg;
xml_path) << endmsg;
return -1;
}