smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

Rename Session::create to Session::create_session_directory and use bool to indicate success/failure

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1872 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-05-18 02:45:56 +00:00
parent 944601ec2d
commit e88f2f2e2f
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/session.h
View file

@ -951,7 +951,8 @@ class Session : public PBD::StatefulDestructible
void update_latency_compensation (bool, bool); void update_latency_compensation (bool, bool);
private: private:
int create (); /// @return true in session directory was successfully created
bool create_session_directory ();
void destroy (); void destroy ();
void initialize_start_and_end_locations(nframes_t start, nframes_t end); void initialize_start_and_end_locations(nframes_t start, nframes_t end);

4
libs/ardour/session.cc
View file

@ -146,7 +146,7 @@ Session::Session (AudioEngine &eng,
// to create a new session. // to create a new session.
assert(mix_template); assert(mix_template);
if (create () || if (!create_session_directory () ||
!create_session_file_from_template (*mix_template)) { !create_session_file_from_template (*mix_template)) {
destroy (); destroy ();
throw failed_constructor (); throw failed_constructor ();
@ -221,7 +221,7 @@ Session::Session (AudioEngine &eng,
initialize_start_and_end_locations(0, initial_length); initialize_start_and_end_locations(0, initial_length);
if (g_file_test (_path.c_str(), GFileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) || if (g_file_test (_path.c_str(), GFileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) ||
create () || !create_session_directory () ||
!create_session_file ()) { !create_session_file ()) {
destroy (); destroy ();
throw failed_constructor (); throw failed_constructor ();

16
libs/ardour/session_state.cc
View file

@ -498,21 +498,21 @@ Session::create_session_file_from_template (const string& template_path)
return true; return true;
} }
int bool
Session::create () Session::create_session_directory ()
{ {
string dir; string dir;
if (g_mkdir_with_parents (_path.c_str(), 0755) < 0) { if (g_mkdir_with_parents (_path.c_str(), 0755) < 0) {
error << string_compose(_("Session: cannot create session dir \"%1\" (%2)"), _path, strerror (errno)) << endmsg; error << string_compose(_("Session: cannot create session dir \"%1\" (%2)"), _path, strerror (errno)) << endmsg;
return -1; return false;
} }
dir = peak_dir (); dir = peak_dir ();
if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) { if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
error << string_compose(_("Session: cannot create session peakfile dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg; error << string_compose(_("Session: cannot create session peakfile dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
return -1; return false;
} }
/* if this is is an existing session with an old "sounds" directory, just use it. see Session::sound_dir() for more details */ /* if this is is an existing session with an old "sounds" directory, just use it. see Session::sound_dir() for more details */
@ -523,7 +523,7 @@ Session::create ()
if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) { if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
error << string_compose(_("Session: cannot create session sounds dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg; error << string_compose(_("Session: cannot create session sounds dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
return -1; return false;
} }
} }
@ -531,17 +531,17 @@ Session::create ()
if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) { if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
error << string_compose(_("Session: cannot create session dead sounds dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg; error << string_compose(_("Session: cannot create session dead sounds dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
return -1; return false;
} }
dir = export_dir (); dir = export_dir ();
if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) { if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
error << string_compose(_("Session: cannot create session export dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg; error << string_compose(_("Session: cannot create session export dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
return -1; return false;
} }
return 0; return true;
} }
int int