Merge branch 'windows+cc' into cairocanvas

[ardour.git] / gtk2_ardour / export_dialog.h

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index a720ec0b9c15d7a6d4a3613119a283dd80f6c0a4..756a3e7b53a4fda2f5b0288262157b7e894d445c 100644 (file)
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -47,7 +47,7 @@ class ExportDialog : public ArdourDialog {
 
   public:
 
-       ExportDialog (PublicEditor & editor, std::string title, std::string xml_node_name);
+       ExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type);
        ~ExportDialog ();
 
        void set_session (ARDOUR::Session* s);
@@ -65,7 +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;
+       ARDOUR::ExportProfileManager::ExportType type;
        HandlerPtr      handler;
        ManagerPtr      profile_manager;
 
@@ -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,15 +93,16 @@ class ExportDialog : public ArdourDialog {
 
        void init ();
 
-       void notify_errors ();
+       void expanded_changed();
+
+       void notify_errors (bool force = false);
        void close_dialog ();
 
        void sync_with_manager ();
-       void update_warnings ();
+       void update_warnings_and_example_filename ();
        void show_conflicting_files ();
 
-       void export_rt ();
-       void export_fw ();
+       void do_export ();
 
        void show_progress ();
        gint progress_timeout ();
@@ -107,10 +111,12 @@ class ExportDialog : public ArdourDialog {
 
        PublicEditor &  editor;
        StatusPtr       status;
-       PBD::ScopedConnection abort_connection;
 
        /*** GUI components ***/
 
+       Glib::RefPtr<Gtk::SizeGroup> advanced_sizegroup;
+       Gtk::Expander * advanced;
+
        /* Warning area */
 
        Gtk::HBox           warn_hbox;
@@ -135,8 +141,7 @@ class ExportDialog : public ArdourDialog {
        /* Buttons */
 
        Gtk::Button *           cancel_button;
-       Gtk::Button *           rt_export_button;
-       Gtk::Button *           fast_export_button;
+       Gtk::Button *           export_button;
 
 };
 
@@ -148,7 +153,7 @@ class ExportRangeDialog : public ExportDialog
   private:
        void init_components ();
 
-        std::string range_id;
+       std::string range_id;
 };
 
 class ExportSelectionDialog : public ExportDialog
@@ -165,6 +170,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 ();