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

UI updates for export-abort

Browse source
This commit is contained in:
Robin Gareus 2016-02-09 21:37:28 +01:00
parent 1ec78d26ee
commit 883a6a3d4e
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/export_dialog.cc
View file

@ -186,7 +186,7 @@ ExportDialog::notify_errors (bool force)
void void
ExportDialog::close_dialog () ExportDialog::close_dialog ()
{ {
if (status->running) { if (status->running ()) {
status->abort(); status->abort();
} }
@ -299,8 +299,6 @@ ExportDialog::do_export ()
void void
ExportDialog::show_progress () ExportDialog::show_progress ()
{ {
status->running = true;
cancel_button->set_label (_("Stop Export")); cancel_button->set_label (_("Stop Export"));
export_button->set_sensitive (false); export_button->set_sensitive (false);
@ -312,7 +310,7 @@ ExportDialog::show_progress ()
gtk_main_iteration (); gtk_main_iteration ();
while (status->running) { while (status->running ()) {
if (gtk_events_pending()) { if (gtk_events_pending()) {
gtk_main_iteration (); gtk_main_iteration ();
} else { } else {

2
gtk2_ardour/export_video_dialog.cc
View file

@ -755,7 +755,7 @@ ExportVideoDialog::launch_export ()
audio_progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ExportVideoDialog::audio_progress_display), 100); audio_progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ExportVideoDialog::audio_progress_display), 100);
_previous_progress = 0.0; _previous_progress = 0.0;
while (status->running) { while (status->running ()) {
if (_aborted) { status->abort(); } if (_aborted) { status->abort(); }
if (gtk_events_pending()) { if (gtk_events_pending()) {
gtk_main_iteration (); gtk_main_iteration ();

2
session_utils/export.cc
View file

@ -120,7 +120,7 @@ static int export_session (Session *session,
// TODO trap SIGINT -> status->abort(); // TODO trap SIGINT -> status->abort();
while (status->running) { while (status->running ()) {
double progress = 0.0; double progress = 0.0;
switch (status->active_job) { switch (status->active_job) {
case ExportStatus::Normalizing: case ExportStatus::Normalizing: