fully implement and deploy explicit x-thread signal connection syntax (testing comes...

[ardour.git] / libs / ardour / ardour / export_handler.h

diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h
index b222c04eb4382d590f79f2176ff67e3a9ecb1789..bbf1f7e20844d7c5bc5b978cb7c400aa61b86614 100644 (file)
--- a/libs/ardour/ardour/export_handler.h
+++ b/libs/ardour/ardour/export_handler.h
@@ -27,9 +27,9 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include "ardour/session.h"
 #include "ardour/ardour.h"
 #include "ardour/types.h"
-#include "ardour/session.h"
 
 namespace ARDOUR
 {
@@ -68,7 +68,7 @@ class ExportElementFactory
        Session & session;
 };
 
-class ExportHandler : public ExportElementFactory, public sigc::trackable
+class ExportHandler : public ExportElementFactory
 {
   private:
 
@@ -118,8 +118,10 @@ class ExportHandler : public ExportElementFactory, public sigc::trackable
 
        bool               realtime;
 
-       sigc::connection          files_written_connection;
+       PBD::ScopedConnection          files_written_connection;
+       PBD::ScopedConnection          export_read_finished_connection;
        std::list<Glib::ustring> files_written;
+       void add_file (const Glib::ustring&);
 
        /* CD Marker stuff */
 
@@ -175,7 +177,7 @@ class ExportHandler : public ExportElementFactory, public sigc::trackable
        TimespanPtr          current_timespan;
        ConfigMap::iterator  current_map_it;
        TimespanBounds       timespan_bounds;
-       sigc::connection     channel_config_connection;
+       PBD::ScopedConnection     channel_config_connection;
 
 };