diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2012-01-28 18:14:19 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2012-01-28 18:14:19 +0000 |
| commit | db384a6f143ee878e70740c65e7c7f699e3fa076 (patch) | |
| tree | fe633d92fb075f3010e70356255db4e3980b3823 /gtk2_ardour/export_dialog.cc | |
| parent | ab8cea1d7c19fddc6b81a6ba4a303a00e4fdd93c (diff) | |
Go back to one progress bar with several passes in export.
Don't calculate the progress bar position in the engine, let the UI decide.
Work around progress bar bug (not verified, as I could not reproduce).
git-svn-id: svn://localhost/ardour2/branches/3.0@11377 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/export_dialog.cc')
| -rw-r--r-- | gtk2_ardour/export_dialog.cc | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 61fa64ad20..845a4a3680 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -125,10 +125,6 @@ ExportDialog::init () progress_widget.pack_start (progress_label, false, false, 6); progress_widget.pack_start (progress_bar, false, false, 6); - progress_widget.pack_start (normalizing_widget, false, false, 0); - normalizing_widget.pack_start (normalizing_label, false, false, 6); - normalizing_widget.pack_start (normalizing_bar, false, false, 6); - /* Buttons */ cancel_button = add_button (Gtk::Stock::CANCEL, RESPONSE_CANCEL); @@ -314,7 +310,6 @@ ExportDialog::show_progress () warning_widget.hide_all(); progress_widget.show (); progress_widget.show_all_children (); - normalizing_widget.hide(); progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ExportDialog::progress_timeout), 100); gtk_main_iteration (); @@ -334,20 +329,27 @@ ExportDialog::show_progress () gint ExportDialog::progress_timeout () { + std::string status_text; + float progress = 0.0; if (status->normalizing) { - normalizing_widget.show(); - normalizing_label.set_text (string_compose (_("Normalizing timespan %1 of %2"), - status->timespan, status->total_timespans)); - normalizing_bar.set_fraction (status->progress); + status_text = string_compose (_("Normalizing timespan %1 of %2"), + status->timespan, status->total_timespans); + progress = ((float) status->current_normalize_cycle) / status->total_normalize_cycles; } else { - normalizing_bar.set_fraction (0); - normalizing_label.set_text (""); + status_text = string_compose (_("Exporting timespan %1 of %2"), + status->timespan, status->total_timespans); + progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan; + } + progress_label.set_text (status_text); - progress_label.set_text (string_compose (_("Exporting timespan %1 of %2"), - status->timespan, status->total_timespans)); - progress_bar.set_fraction (status->progress); + if (progress < previous_progress) { + // Work around gtk bug + progress_bar.hide(); + progress_bar.show(); } + previous_progress = progress; + progress_bar.set_fraction (progress); return TRUE; } |