change PropertyChange from a bitfield into a real object, with all the many widesprea...

[ardour.git] / gtk2_ardour / export_dialog.cc

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index c9a92bd79f86f59baac7017d6117de591af25043..f2feaee44dd1f70bc640ae3c1fff9510360e3478 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,6 +26,9 @@
 #include "ardour/export_status.h"
 #include "ardour/export_handler.h"
 
+#include "export_dialog.h"
+#include "gui_thread.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 
@@ -45,22 +47,26 @@ ExportDialog::~ExportDialog ()
 void
 ExportDialog::set_session (ARDOUR::Session* s)
 {
-       session = s;
+       SessionHandlePtr::set_session (s);
+
+       if (!_session) {
+               return;
+       }
 
        /* Init handler and profile manager */
 
-       handler = session->get_export_handler ();
-       status = session->get_export_status ();
-       profile_manager.reset (new ExportProfileManager (*session));
+       handler = _session->get_export_handler ();
+       status = _session->get_export_status ();
+       profile_manager.reset (new ExportProfileManager (*_session));
 
        /* Possibly init stuff in derived classes */
 
        init ();
 
-       /* Rest of session related initialization */
+       /* Rest of _session related initialization */
 
        preset_selector->set_manager (profile_manager);
-       file_notebook->set_session_and_manager (session, profile_manager);
+       file_notebook->set_session_and_manager (_session, profile_manager);
 
        /* Hand on selection range to profile manager  */
 
@@ -82,7 +88,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, boost::bind (&ExportDialog::notify_errors, this), gui_context());
 
        update_warnings ();
 }
@@ -177,8 +184,8 @@ void
 ExportDialog::init_components ()
 {
        preset_selector.reset (new ExportPresetSelector ());
-       timespan_selector.reset (new ExportTimespanSelectorMultiple (session, profile_manager));
-       channel_selector.reset (new PortExportChannelSelector (session, profile_manager));
+       timespan_selector.reset (new ExportTimespanSelectorMultiple (_session, profile_manager));
+       channel_selector.reset (new PortExportChannelSelector (_session, profile_manager));
        file_notebook.reset (new ExportFileNotebook ());
 }
 
@@ -294,7 +301,7 @@ ExportDialog::show_progress ()
        warning_widget.hide_all();
        progress_widget.show ();
        progress_widget.show_all_children ();
-       progress_connection = Glib::signal_timeout().connect (mem_fun(*this, &ExportDialog::progress_timeout), 100);
+       progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ExportDialog::progress_timeout), 100);
 
        gtk_main_iteration ();
        while (status->running) {
@@ -304,6 +311,10 @@ ExportDialog::show_progress ()
                        usleep (10000);
                }
        }
+       
+       if (!status->aborted()) {
+               status->finish ();
+       }
 }
 
 gint
@@ -372,8 +383,8 @@ void
 ExportRangeDialog::init_components ()
 {
        preset_selector.reset (new ExportPresetSelector ());
-       timespan_selector.reset (new ExportTimespanSelectorSingle (session, profile_manager, range_id));
-       channel_selector.reset (new PortExportChannelSelector (session, profile_manager));
+       timespan_selector.reset (new ExportTimespanSelectorSingle (_session, profile_manager, range_id));
+       channel_selector.reset (new PortExportChannelSelector (_session, profile_manager));
        file_notebook.reset (new ExportFileNotebook ());
 }
 
@@ -385,8 +396,8 @@ void
 ExportSelectionDialog::init_components ()
 {
        preset_selector.reset (new ExportPresetSelector ());
-       timespan_selector.reset (new ExportTimespanSelectorSingle (session, profile_manager, X_("selection")));
-       channel_selector.reset (new PortExportChannelSelector (session, profile_manager));
+       timespan_selector.reset (new ExportTimespanSelectorSingle (_session, profile_manager, X_("selection")));
+       channel_selector.reset (new PortExportChannelSelector (_session, profile_manager));
        file_notebook.reset (new ExportFileNotebook ());
 }
 
@@ -410,7 +421,7 @@ ExportRegionDialog::init_components ()
        Glib::ustring 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));
-       channel_selector.reset (new RegionExportChannelSelector (session, profile_manager, region, track));
+       timespan_selector.reset (new ExportTimespanSelectorSingle (_session, profile_manager, loc_id));
+       channel_selector.reset (new RegionExportChannelSelector (_session, profile_manager, region, track));
        file_notebook.reset (new ExportFileNotebook ());
 }