smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix #4094: show total export progress instead of per timespan progress

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9710 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Sakari Bergen 2011-06-11 21:12:24 +00:00
parent c5f67d62df
commit 1de3eac2de
5 changed files with 25 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/ardour/export_handler.cc
View file

@ -138,6 +138,7 @@ ExportHandler::do_export (bool rt)
std::set<ExportTimespanPtr> timespan_set;
for (ConfigMap::iterator it = config_map.begin(); it != config_map.end(); ++it) {
timespan_set.insert (it->first);
export_status->total_frames += it->first->get_length();
}
export_status->total_timespans = timespan_set.size();
@ -198,7 +199,6 @@ ExportHandler::process_timespan (framecnt_t frames)
/* update position */
framecnt_t frames_to_read = 0;
framepos_t const start = current_timespan->get_start();
framepos_t const end = current_timespan->get_end();
bool const last_cycle = (process_position + frames >= end);
@ -212,7 +212,8 @@ ExportHandler::process_timespan (framecnt_t frames)
}
process_position += frames_to_read;
export_status->progress = (float) (process_position - start) / (end - start);
export_status->processed_frames += frames_to_read;
export_status->progress = (float) export_status->processed_frames / export_status->total_frames;
/* Do actual processing */
@ -224,6 +225,9 @@ ExportHandler::process_normalize ()
{
if (graph_builder->process_normalize ()) {
finish_timespan ();
export_status->normalizing = false;
} else {
export_status->normalizing = true;
}
return 0;