X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_dialog.h;h=835c220c2331f1b7d9a0697bc7aa68da0a03525f;hb=c5fd217a4acc83fe3b52824cdc809d0de093f941;hp=4182b0f236800ec5d367c29ae49e88a48a453cb4;hpb=4d112a8e6b90fa64a5cd333042044768111ba994;p=ardour.git

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 4182b0f236..835c220c23 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -47,7 +47,7 @@ class ExportDialog : public ArdourDialog {
 
   public:
 
-	explicit ExportDialog (PublicEditor & editor, Glib::ustring title);
+	ExportDialog (PublicEditor & editor, std::string title, std::string xml_node_name);
 	~ExportDialog ();
 
 	void set_session (ARDOUR::Session* s);
@@ -65,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;
 
@@ -74,6 +75,9 @@ class ExportDialog : public ArdourDialog {
 	// Must initialize all the shared_ptrs below
 	virtual void init_components ();
 
+	// Override if the channel selector should not be grown
+	virtual bool channel_selector_is_expandable() { return true; }
+
 	boost::scoped_ptr<ExportPresetSelector>   preset_selector;
 	boost::scoped_ptr<ExportTimespanSelector> timespan_selector;
 	boost::scoped_ptr<ExportChannelSelector>  channel_selector;
@@ -89,11 +93,13 @@ class ExportDialog : public ArdourDialog {
 
 	void init ();
 
+	void expanded_changed();
+
 	void notify_errors ();
 	void close_dialog ();
 
 	void sync_with_manager ();
-	void update_warnings ();
+	void update_warnings_and_example_filename ();
 	void show_conflicting_files ();
 
 	void export_rt ();
@@ -110,26 +116,30 @@ class ExportDialog : public ArdourDialog {
 
 	/*** GUI components ***/
 
+	Glib::RefPtr<Gtk::SizeGroup> advanced_sizegroup;
+	Gtk::Expander * advanced;
+
 	/* Warning area */
 
 	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 (std::string const & text);
 	void add_warning (std::string const & text);
 
 	/* Progress bar */
 
-	Gtk::Label              progress_label;
 	Gtk::ProgressBar        progress_bar;
 	sigc::connection        progress_connection;
 
+	float previous_progress; // Needed for gtk bug workaround
+
 	/* Buttons */
 
 	Gtk::Button *           cancel_button;
@@ -145,8 +155,8 @@ class ExportRangeDialog : public ExportDialog
 
   private:
 	void init_components ();
-        
-        std::string range_id;
+
+	std::string range_id;
 };
 
 class ExportSelectionDialog : public ExportDialog
@@ -160,9 +170,12 @@ class ExportSelectionDialog : public ExportDialog
 
 class ExportRegionDialog : public ExportDialog
 {
-	public:
+  public:
 	ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track);
 
+  protected:
+	virtual bool channel_selector_is_expandable() { return false; }
+
   private:
 	void init_gui ();
 	void init_components ();
@@ -171,4 +184,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__ */