ardour/livetrax
13
0
Fork 0
Code

more error messages if session renaming fails, and remove stupid use of RENAME macro and use ::g_rename() instead

Browse Source
This commit is contained in:
Paul Davis 2014-03-12 08:49:18 -04:00
parent 36160b88cd
commit 9f98837255
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ardour/session_state.cc
View File

@ -3602,8 +3602,6 @@ Session::rename (const std::string& new_name)
string const old_sources_root = _session_dir->sources_root();
#define RENAME ::rename
/* Rename:
* session directory
@ -3665,7 +3663,8 @@ Session::rename (const std::string& new_name)
cerr << "Rename " << oldstr << " => " << newstr << endl;
if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) {
if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
return 1;
}
@ -3692,7 +3691,8 @@ Session::rename (const std::string& new_name)
cerr << "Rename " << oldstr << " => " << newstr << endl;
if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) {
if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
return 1;
}
}
@ -3704,7 +3704,8 @@ Session::rename (const std::string& new_name)
cerr << "Rename " << oldstr << " => " << newstr << endl;
if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) {
if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
return 1;
}
@ -3718,7 +3719,8 @@ Session::rename (const std::string& new_name)
cerr << "Rename " << oldstr << " => " << newstr << endl;
if (RENAME (oldstr.c_str(), newstr.c_str()) != 0) {
if (::g_rename (oldstr.c_str(), newstr.c_str()) != 0) {
error << string_compose (_("renaming %s as %2 failed (%3)"), oldstr, newstr, g_strerror (errno)) << endmsg;
return 1;
}
}
@ -3754,8 +3756,6 @@ Session::rename (const std::string& new_name)
store_recent_sessions (new_name, _path);
return 0;
#undef RENAME
}
int