ardour/livetrax
13
0
Fork 0
Code

Simplify finalization code in Session::import_audiofile

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@2670 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-11-15 02:32:11 +00:00
parent 7976efd071
commit 20d6a70b15
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libs/ardour/import.cc
View File

@ -162,7 +162,6 @@ Session::import_audiofile (import_status& status)
string basepath;
int ret = -1;
vector<string> new_paths;
struct tm* now;
uint32_t cnt = 1;
status.sources.clear ();
@ -238,26 +237,25 @@ Session::import_audiofile (import_status& status)
}
}
status.freeze = true;
time_t xnow;
time (&xnow);
now = localtime (&xnow);
/* flush the final length(s) to the header(s) */
for (SourceList::iterator x = status.sources.begin(); x != status.sources.end() && !status.cancel; ++x) {
boost::dynamic_pointer_cast<AudioFileSource>(*x)->update_header(0, *now, xnow);
boost::dynamic_pointer_cast<AudioSource>(*x)->done_with_peakfile_writes ();
}
/* save state so that we don't lose these new Sources */
if (!status.cancel) {
save_state (_name);
}
struct tm* now;
time_t xnow;
time (&xnow);
now = localtime (&xnow);
status.freeze = true;
ret = 0;
/* flush the final length(s) to the header(s) */
for (SourceList::iterator x = status.sources.begin(); x != status.sources.end(); ++x) {
boost::dynamic_pointer_cast<AudioFileSource>(*x)->update_header(0, *now, xnow);
boost::dynamic_pointer_cast<AudioSource>(*x)->done_with_peakfile_writes ();
}
/* save state so that we don't lose these new Sources */
save_state (_name);
ret = 0;
}
out: