diff options
| author | Robin Gareus <robin@gareus.org> | 2016-02-09 21:37:28 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-02-09 21:37:28 +0100 |
| commit | 883a6a3d4e0481d1145e62c995ed937e69245a94 (patch) | |
| tree | 50df57b6aeec53bf5cab8952d47d8d682657c2ec | |
| parent | 1ec78d26ee7cd5a612a7f98f9977dbb8ef46a593 (diff) | |
UI updates for export-abort
| -rw-r--r-- | gtk2_ardour/export_dialog.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/export_video_dialog.cc | 2 | ||||
| -rw-r--r-- | session_utils/export.cc | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 96870428ef..acf34dcbbe 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -186,7 +186,7 @@ ExportDialog::notify_errors (bool force) void ExportDialog::close_dialog () { - if (status->running) { + if (status->running ()) { status->abort(); } @@ -299,8 +299,6 @@ ExportDialog::do_export () void ExportDialog::show_progress () { - status->running = true; - cancel_button->set_label (_("Stop Export")); export_button->set_sensitive (false); @@ -312,7 +310,7 @@ ExportDialog::show_progress () gtk_main_iteration (); - while (status->running) { + while (status->running ()) { if (gtk_events_pending()) { gtk_main_iteration (); } else { diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index 18bbfcf5a8..f09306db0d 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -755,7 +755,7 @@ ExportVideoDialog::launch_export () audio_progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ExportVideoDialog::audio_progress_display), 100); _previous_progress = 0.0; - while (status->running) { + while (status->running ()) { if (_aborted) { status->abort(); } if (gtk_events_pending()) { gtk_main_iteration (); diff --git a/session_utils/export.cc b/session_utils/export.cc index 6b27860ffd..13f78986aa 100644 --- a/session_utils/export.cc +++ b/session_utils/export.cc @@ -120,7 +120,7 @@ static int export_session (Session *session, // TODO trap SIGINT -> status->abort(); - while (status->running) { + while (status->running ()) { double progress = 0.0; switch (status->active_job) { case ExportStatus::Normalizing: |