X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_dialog.h;h=5c9e346f50c4bf8b731e29131f2de6adf09508dc;hb=267cfbe731debe3f3be88375bce34644ac7c6323;hp=5a1d7839caaddf180ac6ce317b6eedbbbb046a2c;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 5a1d7839ca..5c9e346f50 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -21,9 +21,9 @@
 #ifndef __export_dialog_h__
 #define __export_dialog_h__
 
-#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <string>
 
-#include "ardour/export_handler.h"
 #include "ardour/export_profile_manager.h"
 
 #include "public_editor.h"
@@ -35,10 +35,9 @@
 
 #include <gtkmm.h>
 
-#include "i18n.h"
-
 namespace ARDOUR {
 	class ExportStatus;
+	class ExportHandler;
 }
 
 class ExportTimespanSelector;
@@ -48,7 +47,7 @@ class ExportDialog : public ArdourDialog {
 
   public:
 
-	explicit ExportDialog (PublicEditor & editor, Glib::ustring title = _("Export"));
+	ExportDialog (PublicEditor & editor, std::string title, std::string xml_node_name);
 	~ExportDialog ();
 
 	void set_session (ARDOUR::Session* s);
@@ -66,6 +65,7 @@ class ExportDialog : public ArdourDialog {
 	typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
 	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
 
+	std::string     xml_node_name;
 	HandlerPtr      handler;
 	ManagerPtr      profile_manager;
 
@@ -75,10 +75,10 @@ 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;
@@ -107,6 +107,7 @@ class ExportDialog : public ArdourDialog {
 
 	PublicEditor &  editor;
 	StatusPtr       status;
+	PBD::ScopedConnection abort_connection;
 
 	/*** GUI components ***/
 
@@ -114,15 +115,15 @@ class ExportDialog : public ArdourDialog {
 
 	Gtk::HBox           warn_hbox;
 	Gtk::Label          warn_label;
-	Glib::ustring       warn_string;
+	std::string       warn_string;
 
 	Gtk::HBox           list_files_hbox;
 	Gtk::Label          list_files_label;
 	Gtk::Button         list_files_button;
-	Glib::ustring       list_files_string;
+	std::string       list_files_string;
 
-	void add_error (Glib::ustring const & text);
-	void add_warning (Glib::ustring const & text);
+	void add_error (std::string const & text);
+	void add_warning (std::string const & text);
 
 	/* Progress bar */
 
@@ -141,12 +142,12 @@ class ExportDialog : public ArdourDialog {
 class ExportRangeDialog : public ExportDialog
 {
   public:
-	ExportRangeDialog (PublicEditor & editor, Glib::ustring range_id);
+	ExportRangeDialog (PublicEditor & editor, std::string range_id);
 
   private:
 	void init_components ();
-
-	Glib::ustring range_id;
+        
+        std::string range_id;
 };
 
 class ExportSelectionDialog : public ExportDialog
@@ -160,7 +161,7 @@ class ExportSelectionDialog : public ExportDialog
 
 class ExportRegionDialog : public ExportDialog
 {
-	public:
+  public:
 	ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track);
 
   private:
@@ -171,4 +172,13 @@ class ExportRegionDialog : public ExportDialog
 	ARDOUR::AudioTrack & track;
 };
 
+class StemExportDialog : public ExportDialog
+{
+  public:
+	StemExportDialog (PublicEditor & editor);
+	
+  private:
+	void init_components ();
+};
+
 #endif /* __ardour_export_dialog_h__ */