ardour/livetrax
13
0
Fork 0
Code

Use SessionDirectory class in place of Session::create_session_directory when creating a session from a template

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1875 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-05-18 02:46:19 +00:00
parent 04c1ce1960
commit b8a14dff49
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libs/ardour/session.cc
View File

@ -124,32 +124,35 @@ Session::Session (AudioEngine &eng,
throw failed_constructor();
}
cerr << "Loading session " << fullpath << " using snapshot " << snapshot_name << " (1)" << endl;
n_physical_outputs = _engine.n_physical_outputs();
n_physical_inputs = _engine.n_physical_inputs();
first_stage_init (fullpath, snapshot_name);
initialize_start_and_end_locations(0, compute_initial_length ());
bool new_session = !g_file_test (_path.c_str(), GFileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
if (new_session) {
// A mix_template must be specified if using this constructor
// to create a new session.
assert(mix_template);
SessionDirectory sdir(fullpath);
if (!create_session_directory () ||
!create_session_file_from_template (*mix_template)) {
destroy ();
throw failed_constructor ();
}
// Continue construction like a normal saved session from now on.
new_session = false;
if (mix_template &&
sdir.create() &&
create_session_file_from_template (*mix_template)) {
cerr << "Creating session " << fullpath
<<" using template" << *mix_template
<< endl;
} else if (sdir.is_valid ()) {
cerr << "Loading session " << fullpath
<< " using snapshot " << snapshot_name << " (1)"
<< endl;
} else {
destroy ();
throw failed_constructor ();
}
if (second_stage_init (new_session)) {
if (second_stage_init (false)) {
destroy ();
throw failed_constructor ();
}