X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fexport_dialog.h;h=835c220c2331f1b7d9a0697bc7aa68da0a03525f;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=9b06492cdd4a6896e0d381e9dd43c5f16f2d1cb6;hpb=eb85208fe8ab985831acc7011c3cebd219aa0031;p=ardour.git

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 9b06492cdd..835c220c23 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -75,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;
@@ -90,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 ();
@@ -111,6 +116,9 @@ class ExportDialog : public ArdourDialog {
 
 	/*** GUI components ***/
 
+	Glib::RefPtr<Gtk::SizeGroup> advanced_sizegroup;
+	Gtk::Expander * advanced;
+
 	/* Warning area */
 
 	Gtk::HBox           warn_hbox;
@@ -127,15 +135,10 @@ class ExportDialog : public ArdourDialog {
 
 	/* Progress bar */
 
-	Gtk::Label              progress_label;
 	Gtk::ProgressBar        progress_bar;
 	sigc::connection        progress_connection;
 
-	/* Normalizing */
-
-	Gtk::VBox               normalizing_widget;
-	Gtk::Label              normalizing_label;
-	Gtk::ProgressBar        normalizing_bar;
+	float previous_progress; // Needed for gtk bug workaround
 
 	/* Buttons */
 
@@ -153,7 +156,7 @@ class ExportRangeDialog : public ExportDialog
   private:
 	void init_components ();
 
-        std::string range_id;
+	std::string range_id;
 };
 
 class ExportSelectionDialog : public ExportDialog
@@ -170,6 +173,9 @@ class ExportRegionDialog : public ExportDialog
   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 ();