diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2011-06-11 21:12:24 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2011-06-11 21:12:24 +0000 |
| commit | 1de3eac2deeb5400e349114ff59d6fa0a6d6de1e (patch) | |
| tree | b9ab48878dad4e5bbce0f3d177b36b14db84357d /gtk2_ardour/export_dialog.cc | |
| parent | c5f67d62dff570c208f55c58d6cd96e8af86b852 (diff) | |
Fix #4094: show total export progress instead of per timespan progress
git-svn-id: svn://localhost/ardour2/branches/3.0@9710 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/export_dialog.cc')
| -rw-r--r-- | gtk2_ardour/export_dialog.cc | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index e51f5771d3..50796f2fcc 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -328,26 +328,15 @@ ExportDialog::show_progress () gint ExportDialog::progress_timeout () { - switch (status->stage) { - case export_None: - progress_label.set_text (""); - break; - case export_ReadTimespan: - progress_label.set_text (string_compose (_("Reading timespan %1 of %2"), status->timespan, status->total_timespans)); - break; - case export_PostProcess: - progress_label.set_text (string_compose (_("Processing file %2 of %3 (%1) from timespan %4 of %5"), - file_notebook->get_nth_format_name (status->format), - status->format, status->total_formats, - status->timespan, status->total_timespans)); - break; - case export_Write: - progress_label.set_text (string_compose (_("Encoding file %2 of %3 (%1) from timespan %4 of %5"), - file_notebook->get_nth_format_name (status->format), - status->format, status->total_formats, - status->timespan, status->total_timespans)); - break; + std::string status_text; + if (status->normalizing) { + status_text = string_compose (_("Normalizing timespan %1 of %2"), + status->timespan, status->total_timespans); + } else { + status_text = string_compose (_("Exporting timespan %1 of %2"), + status->timespan, status->total_timespans); } + progress_label.set_text (status_text); progress_bar.set_fraction (status->progress); return TRUE; |