X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_dialog.h;h=33a983062f5ec96d6295d2cca4626554a627581b;hb=f0db054a07ecc9d49fede8fcc9175a85c635369f;hp=0528c514b676e1f25f93f5eb3208573986437f1d;hpb=ccc3461a580324055684f598d439209fe951b574;p=ardour.git

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 0528c514b6..33a983062f 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -21,10 +21,9 @@
 #ifndef __export_dialog_h__
 #define __export_dialog_h__
 
-#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
-#include <ardour/export_handler.h>
-#include <ardour/export_profile_manager.h>
+#include "ardour/export_profile_manager.h"
 
 #include "public_editor.h"
 #include "export_timespan_selector.h"
@@ -39,6 +38,7 @@
 
 namespace ARDOUR {
 	class ExportStatus;
+	class ExportHandler;
 }
 
 class ExportTimespanSelector;
@@ -50,9 +50,9 @@ class ExportDialog : public ArdourDialog {
 
 	explicit ExportDialog (PublicEditor & editor, Glib::ustring title = _("Export"));
 	~ExportDialog ();
-	
+
 	void set_session (ARDOUR::Session* s);
-	
+
 	/* Responses */
 
 	enum Responses {
@@ -65,7 +65,7 @@ class ExportDialog : public ArdourDialog {
 
 	typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
 	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
-	
+
 	HandlerPtr      handler;
 	ManagerPtr      profile_manager;
 
@@ -75,14 +75,14 @@ class ExportDialog : public ArdourDialog {
 	// Must initialize all the shared_ptrs below
 	virtual void init_components ();
 
-	boost::shared_ptr<ExportPresetSelector>   preset_selector;
-	boost::shared_ptr<ExportTimespanSelector> timespan_selector;
-	boost::shared_ptr<ExportChannelSelector>  channel_selector;
-	boost::shared_ptr<ExportFileNotebook>     file_notebook;
-	
+	boost::scoped_ptr<ExportPresetSelector>   preset_selector;
+	boost::scoped_ptr<ExportTimespanSelector> timespan_selector;
+	boost::scoped_ptr<ExportChannelSelector>  channel_selector;
+	boost::scoped_ptr<ExportFileNotebook>     file_notebook;
+
 	Gtk::VBox                                 warning_widget;
 	Gtk::VBox                                 progress_widget;
-	
+
 	Gtk::Label *                              timespan_label;
 	Gtk::Label *                              channels_label;
 
@@ -92,46 +92,47 @@ class ExportDialog : public ArdourDialog {
 
 	void notify_errors ();
 	void close_dialog ();
-	
+
 	void sync_with_manager ();
 	void update_warnings ();
 	void show_conflicting_files ();
 
 	void export_rt ();
 	void export_fw ();
-	
+
 	void show_progress ();
 	gint progress_timeout ();
-	
+
 	typedef boost::shared_ptr<ARDOUR::ExportStatus> StatusPtr;
-	
+
 	PublicEditor &  editor;
 	StatusPtr       status;
-	
+	PBD::ScopedConnection abort_connection;
+
 	/*** GUI components ***/
-	
+
 	/* Warning area */
-	
+
 	Gtk::HBox           warn_hbox;
 	Gtk::Label          warn_label;
 	Glib::ustring       warn_string;
-	
+
 	Gtk::HBox           list_files_hbox;
 	Gtk::Label          list_files_label;
 	Gtk::Button         list_files_button;
 	Glib::ustring       list_files_string;
-	
+
 	void add_error (Glib::ustring const & text);
 	void add_warning (Glib::ustring const & text);
-	
+
 	/* Progress bar */
-	
+
 	Gtk::Label              progress_label;
 	Gtk::ProgressBar        progress_bar;
 	sigc::connection        progress_connection;
-	
+
 	/* Buttons */
-	
+
 	Gtk::Button *           cancel_button;
 	Gtk::Button *           rt_export_button;
 	Gtk::Button *           fast_export_button;
@@ -145,7 +146,7 @@ class ExportRangeDialog : public ExportDialog
 
   private:
 	void init_components ();
-	
+
 	Glib::ustring range_id;
 };
 
@@ -166,7 +167,7 @@ class ExportRegionDialog : public ExportDialog
   private:
 	void init_gui ();
 	void init_components ();
-	
+
 	ARDOUR::AudioRegion const & region;
 	ARDOUR::AudioTrack & track;
 };