OSC: Changed gainVCA to gainfader as VCA is already used.

[ardour.git] / gtk2_ardour / export_dialog.cc

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 57a8ba76300055727d0850251e0c5886c339a961..7c2e509a96a9e65040045bea239cf5aeba5bd9ce 100644 (file)
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -28,6 +28,7 @@
 #include "ardour/export_handler.h"
 
 #include "export_dialog.h"
+#include "export_report.h"
 #include "gui_thread.h"
 #include "nag.h"
 
@@ -129,11 +130,11 @@ ExportDialog::init ()
        export_button = add_button (_("Export"), RESPONSE_FAST);
        set_default_response (RESPONSE_FAST);
 
-       list_files_button.set_name ("PaddedButton");
-
        cancel_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::close_dialog));
        export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::do_export));
 
+       file_notebook->soundcloud_export_selector = soundcloud_selector;
+
        /* Done! */
 
        show_all_children ();
@@ -156,7 +157,7 @@ ExportDialog::init_gui ()
        export_notebook.append_page (*file_format_selector, _("File format"));
        export_notebook.append_page (*timespan_selector, _("Time Span"));
        export_notebook.append_page (*channel_selector, _("Channels"));
-       
+
        get_vbox()->pack_start (export_notebook, true, true, 0);
        get_vbox()->pack_end   (warning_widget, false, false, 0);
        get_vbox()->pack_end   (progress_widget, false, false, 0);
@@ -186,7 +187,7 @@ ExportDialog::notify_errors (bool force)
 void
 ExportDialog::close_dialog ()
 {
-       if (status->running) {
+       if (status->running ()) {
                status->abort();
        }
 
@@ -271,13 +272,14 @@ ExportDialog::do_export ()
 {
        try {
                profile_manager->prepare_for_export ();
-               handler->soundcloud_username    = soundcloud_selector->username ();
-               handler->soundcloud_password    = soundcloud_selector->password ();
-               handler->soundcloud_make_public = soundcloud_selector->make_public ();
-               handler->soundcloud_open_page   = soundcloud_selector->open_page ();
+               handler->soundcloud_username     = soundcloud_selector->username ();
+               handler->soundcloud_password     = soundcloud_selector->password ();
+               handler->soundcloud_make_public  = soundcloud_selector->make_public ();
+               handler->soundcloud_open_page    = soundcloud_selector->open_page ();
+               handler->soundcloud_downloadable = soundcloud_selector->downloadable ();
 
                handler->SoundcloudProgress.connect_same_thread(
-                               *this, 
+                               *this,
                                boost::bind(&ExportDialog::soundcloud_upload_progress, this, _1, _2, _3)
                                );
 #if 0
@@ -298,7 +300,7 @@ ExportDialog::do_export ()
 void
 ExportDialog::show_progress ()
 {
-       status->running = true;
+       export_notebook.set_sensitive (false);
 
        cancel_button->set_label (_("Stop Export"));
        export_button->set_sensitive (false);
@@ -311,7 +313,7 @@ ExportDialog::show_progress ()
 
        gtk_main_iteration ();
 
-       while (status->running) {
+       while (status->running ()) {
                if (gtk_events_pending()) {
                        gtk_main_iteration ();
                } else {
@@ -319,10 +321,19 @@ ExportDialog::show_progress ()
                }
        }
 
+       status->finish ();
+
+       if (!status->aborted() && status->result_map.size() > 0) {
+               hide();
+               ExportReport er (_session, status);
+               er.run();
+       }
+
        if (!status->aborted()) {
+               hide();
 
                NagScreen* ns = NagScreen::maybe_nag (_("export"));
-               
+
                if (ns) {
                        ns->nag ();
                        delete ns;
@@ -330,24 +341,38 @@ ExportDialog::show_progress ()
        } else {
                notify_errors ();
        }
-
-       status->finish ();
+       export_notebook.set_sensitive (true);
 }
 
 gint
 ExportDialog::progress_timeout ()
 {
        std::string status_text;
-       float progress = 0.0;
-       if (status->normalizing) {
+       float progress = -1;
+       switch (status->active_job) {
+       case ExportStatus::Exporting:
+               status_text = string_compose (_("Exporting '%3' (timespan %1 of %2)"),
+                                             status->timespan, status->total_timespans, status->timespan_name);
+               progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan;
+               break;
+       case ExportStatus::Normalizing:
                status_text = string_compose (_("Normalizing '%3' (timespan %1 of %2)"),
                                              status->timespan, status->total_timespans, status->timespan_name);
                progress = ((float) status->current_normalize_cycle) / status->total_normalize_cycles;
-       } else {
-               status_text = string_compose (_("Exporting '%3' (timespan %1 of %2)"),
+               break;
+       case ExportStatus::Tagging:
+               status_text = string_compose (_("Tagging '%3' (timespan %1 of %2)"),
                                              status->timespan, status->total_timespans, status->timespan_name);
-               progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan;
+               break;
+       case ExportStatus::Uploading:
+               status_text = string_compose (_("Uploading '%3' (timespan %1 of %2)"),
+                                             status->timespan, status->total_timespans, status->timespan_name);
+               break;
+       case ExportStatus::Command:
+               status_text = string_compose (_("Running Post Export Command for '%1'"), status->timespan_name);
+               break;
        }
+
        progress_bar.set_text (status_text);
 
        if (progress < previous_progress) {
@@ -357,7 +382,12 @@ ExportDialog::progress_timeout ()
        }
        previous_progress = progress;
 
-       progress_bar.set_fraction (progress);
+       if (progress >= 0) {
+               progress_bar.set_fraction (progress);
+       } else {
+               progress_bar.set_pulse_step(.1);
+               progress_bar.pulse();
+       }
        return TRUE;
 }