UI updates for export-abort

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 96870428efba03bf2f9c9374168fa31f9136baf0..acf34dcbbe76ccbc90879ce85f196dbd7b7fd554 100644 (file)
--- 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 18bbfcf5a8ab7e9767cab80142214694b69c7cdc..f09306db0d5078676b16e0cf393b5867a13b5a61 100644 (file)
--- 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 6b27860ffdba151fdb2dc192c6e35a2e9a1693d6..13f78986aa3334e9dd7c719358979545ea5e9571 100644 (file)
--- 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: