Merge branch 'patches' of https://github.com/jdekozak/ardour

[ardour.git] / gtk2_ardour / export_dialog.h

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 835c220c2331f1b7d9a0697bc7aa68da0a03525f..52c53660d865a17e78fa7e4f7e8e27406346612a 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;
 
@@ -102,8 +102,7 @@ class ExportDialog : public ArdourDialog {
        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 ();
@@ -112,7 +111,6 @@ class ExportDialog : public ArdourDialog {
 
        PublicEditor &  editor;
        StatusPtr       status;
-       PBD::ScopedConnection abort_connection;
 
        /*** GUI components ***/
 
@@ -143,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;
 
 };