smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Use sys::path and SessionDirectory classes in Session::load_state for portability

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@2368 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-09-04 04:47:44 +00:00
parent 54f525770f
commit 39cd07a969
1 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
libs/ardour/session_state.cc
View file

@ -653,15 +653,12 @@ Session::load_state (string snapshot_name)
state_tree = 0; state_tree = 0;
} }
string xmlpath;
state_was_pending = false; state_was_pending = false;
/* check for leftover pending state from a crashed capture attempt */ /* check for leftover pending state from a crashed capture attempt */
xmlpath = _path; sys::path xmlpath(_session_dir->root_path());
xmlpath += snapshot_name; xmlpath /= snapshot_name + pending_suffix;
xmlpath += pending_suffix;
if (sys::exists (xmlpath)) { if (sys::exists (xmlpath)) {
@ -673,14 +670,12 @@ Session::load_state (string snapshot_name)
} }
if (!state_was_pending) { if (!state_was_pending) {
xmlpath = _session_dir->root_path();
xmlpath = _path; xmlpath /= snapshot_name + statefile_suffix;
xmlpath += snapshot_name;
xmlpath += statefile_suffix;
} }
if (!sys::exists (xmlpath)) { if (!sys::exists (xmlpath)) {
error << string_compose(_("%1: session state information file \"%2\" doesn't exist!"), _name, xmlpath) << endmsg; error << string_compose(_("%1: session state information file \"%2\" doesn't exist!"), _name, xmlpath.to_string()) << endmsg;
return 1; return 1;
} }
@ -688,8 +683,8 @@ Session::load_state (string snapshot_name)
set_dirty(); set_dirty();
if (!state_tree->read (xmlpath)) { if (!state_tree->read (xmlpath.to_string())) {
error << string_compose(_("Could not understand ardour file %1"), xmlpath) << endmsg; error << string_compose(_("Could not understand ardour file %1"), xmlpath.to_string()) << endmsg;
delete state_tree; delete state_tree;
state_tree = 0; state_tree = 0;
return -1; return -1;
@ -698,7 +693,7 @@ Session::load_state (string snapshot_name)
XMLNode& root (*state_tree->root()); XMLNode& root (*state_tree->root());
if (root.name() != X_("Session")) { if (root.name() != X_("Session")) {
error << string_compose (_("Session file %1 is not an Ardour session"), xmlpath) << endmsg; error << string_compose (_("Session file %1 is not an Ardour session"), xmlpath.to_string()) << endmsg;
delete state_tree; delete state_tree;
state_tree = 0; state_tree = 0;
return -1; return -1;
@ -719,18 +714,16 @@ Session::load_state (string snapshot_name)
} }
if (is_old) { if (is_old) {
string backup_path;
backup_path = _path; sys::path backup_path(_session_dir->root_path());
backup_path += snapshot_name;
backup_path += "-1"; backup_path /= snapshot_name + "-1" + statefile_suffix;
backup_path += statefile_suffix;
info << string_compose (_("Copying old session file %1 to %2\nUse %2 with Ardour versions before 2.0 from now on"), info << string_compose (_("Copying old session file %1 to %2\nUse %2 with Ardour versions before 2.0 from now on"),
xmlpath, backup_path) xmlpath.to_string(), backup_path.to_string())
<< endmsg; << endmsg;
copy_file (xmlpath, backup_path); copy_file (xmlpath.to_string(), backup_path.to_string());
/* if it fails, don't worry. right? */ /* if it fails, don't worry. right? */
} }