add GUI elements to control 2in/2out panning. Probably not perfect. REQUIRES FULL...

[ardour.git] / gtk2_ardour / export_dialog.cc

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 1ec466d44928d037b7ab4a91cb7485cbdf77823d..da9484cca7ecbcf7984c320e5e6b1622f3f9ed3e 100644 (file)
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -18,7 +18,6 @@
 
 */
 
-#include "export_dialog.h"
 
 #include <sigc++/signal.h>
 
@@ -27,10 +26,16 @@
 #include "ardour/export_status.h"
 #include "ardour/export_handler.h"
 
+#include "export_dialog.h"
+#include "gui_thread.h"
+
+#include "i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
+using std::string;
 
-ExportDialog::ExportDialog (PublicEditor & editor, Glib::ustring title) :
+ExportDialog::ExportDialog (PublicEditor & editor, std::string title) :
   ArdourDialog (title),
   editor (editor),
 
@@ -86,7 +91,8 @@ ExportDialog::set_session (ARDOUR::Session* s)
        timespan_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings));
        channel_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings));
        file_notebook->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings));
-       status->Aborting.connect (sigc::mem_fun (*this, &ExportDialog::notify_errors));
+
+       status->Aborting.connect (abort_connection, invalidator (*this), boost::bind (&ExportDialog::notify_errors, this), gui_context());
 
        update_warnings ();
 }
@@ -119,13 +125,15 @@ ExportDialog::init ()
        /* Buttons */
 
        cancel_button = add_button (Gtk::Stock::CANCEL, RESPONSE_CANCEL);
-       rt_export_button = add_button (_("Realtime Export"), RESPONSE_RT);
-       fast_export_button = add_button (_("Fast Export"), RESPONSE_FAST);
+       // Realtime export is disabled for now, as it will most probably not work
+       //rt_export_button = add_button (_("Realtime Export"), RESPONSE_RT);
+       //fast_export_button = add_button (_("Fast Export"), RESPONSE_FAST);
+       fast_export_button = add_button (_("Export"), RESPONSE_FAST);
 
        list_files_button.set_name ("PaddedButton");
 
        cancel_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::close_dialog));
-       rt_export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::export_rt));
+       //rt_export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::export_rt));
        fast_export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::export_fw));
 
        /* Done! */
@@ -190,7 +198,7 @@ void
 ExportDialog::notify_errors ()
 {
        if (status->errors()) {
-               Glib::ustring txt = _("Export has been aborted due to an error!\nSee the Log for details.");
+               std::string txt = _("Export has been aborted due to an error!\nSee the Log for details.");
                Gtk::MessageDialog msg (txt, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
                msg.run();
        }
@@ -230,24 +238,24 @@ ExportDialog::update_warnings ()
        list_files_string = "";
 
        fast_export_button->set_sensitive (true);
-       rt_export_button->set_sensitive (true);
+       //rt_export_button->set_sensitive (true);
 
        /* Add new warnings */
 
        boost::shared_ptr<ExportProfileManager::Warnings> warnings = profile_manager->get_warnings();
 
-       for (std::list<Glib::ustring>::iterator it = warnings->errors.begin(); it != warnings->errors.end(); ++it) {
+       for (std::list<string>::iterator it = warnings->errors.begin(); it != warnings->errors.end(); ++it) {
                add_error (*it);
        }
 
-       for (std::list<Glib::ustring>::iterator it = warnings->warnings.begin(); it != warnings->warnings.end(); ++it) {
+       for (std::list<string>::iterator it = warnings->warnings.begin(); it != warnings->warnings.end(); ++it) {
                add_warning (*it);
        }
 
        if (!warnings->conflicting_filenames.empty()) {
                list_files_hbox.show ();
-               for (std::list<Glib::ustring>::iterator it = warnings->conflicting_filenames.begin(); it != warnings->conflicting_filenames.end(); ++it) {
-                       Glib::ustring::size_type pos = it->find_last_of ("/");
+               for (std::list<string>::iterator it = warnings->conflicting_filenames.begin(); it != warnings->conflicting_filenames.end(); ++it) {
+                       string::size_type pos = it->find_last_of ("/");
                        list_files_string += "\n" + it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>";
                }
        }
@@ -291,7 +299,7 @@ ExportDialog::show_progress ()
        status->running = true;
 
        cancel_button->set_label (_("Stop Export"));
-       rt_export_button->set_sensitive (false);
+       //rt_export_button->set_sensitive (false);
        fast_export_button->set_sensitive (false);
 
        progress_bar.set_fraction (0.0);
@@ -308,6 +316,10 @@ ExportDialog::show_progress ()
                        usleep (10000);
                }
        }
+       
+       if (!status->aborted()) {
+               status->finish ();
+       }
 }
 
 gint
@@ -339,10 +351,10 @@ ExportDialog::progress_timeout ()
 }
 
 void
-ExportDialog::add_error (Glib::ustring const & text)
+ExportDialog::add_error (string const & text)
 {
        fast_export_button->set_sensitive (false);
-       rt_export_button->set_sensitive (false);
+       //rt_export_button->set_sensitive (false);
 
        if (warn_string.empty()) {
                warn_string = _("<span color=\"#ffa755\">Error: ") + text + "</span>";
@@ -354,7 +366,7 @@ ExportDialog::add_error (Glib::ustring const & text)
 }
 
 void
-ExportDialog::add_warning (Glib::ustring const & text)
+ExportDialog::add_warning (string const & text)
 {
        if (warn_string.empty()) {
                warn_string = _("<span color=\"#ffa755\">Warning: ") + text + "</span>";
@@ -367,7 +379,7 @@ ExportDialog::add_warning (Glib::ustring const & text)
 
 /*** Dialog specializations ***/
 
-ExportRangeDialog::ExportRangeDialog (PublicEditor & editor, Glib::ustring range_id) :
+ExportRangeDialog::ExportRangeDialog (PublicEditor & editor, string range_id) :
   ExportDialog (editor, _("Export Range")),
   range_id (range_id)
 {}
@@ -411,7 +423,7 @@ ExportRegionDialog::init_gui ()
 void
 ExportRegionDialog::init_components ()
 {
-       Glib::ustring loc_id = profile_manager->set_single_range (region.position(), region.position() + region.length(), region.name());
+       string loc_id = profile_manager->set_single_range (region.position(), region.position() + region.length(), region.name());
 
        preset_selector.reset (new ExportPresetSelector ());
        timespan_selector.reset (new ExportTimespanSelectorSingle (_session, profile_manager, loc_id));