Tidy.

[ardour.git] / gtk2_ardour / export_dialog.cc

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 62f43f37fddebc5c3af61e76475c741b2efd6502..ef99bf43bf8059330c507686e5c70ac5c3274c9b 100644 (file)
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -129,7 +129,7 @@ ExportDialog::ExportDialog(PublicEditor& e)
        set_wmclass (X_("ardour_export"), "Ardour");
        set_name ("ExportWindow");
        add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
+       
        spec.running = false;
 
        file_entry.set_name ("ExportFileNameEntry");
@@ -143,7 +143,7 @@ ExportDialog::ExportDialog(PublicEditor& e)
        master_selector.append_column_editable(_("Left"), exp_cols.left);
        master_selector.append_column_editable(_("Right"), exp_cols.right);
        master_selector.get_column(0)->set_min_width(100);
-       
+
        master_selector.get_column(1)->set_min_width(40);
        master_selector.get_column(1)->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE);
        master_selector.get_column(2)->set_min_width(40);
@@ -975,8 +975,9 @@ ExportDialog::do_export ()
        progress_connection = Glib::signal_timeout().connect (mem_fun(*this, &ExportDialog::progress_timeout), 100);
        cancel_label.set_text (_("Stop Export"));
 
+       session->pre_export ();
        export_data();
-       
+
        progress_connection.disconnect ();
        end_dialog ();
 }
@@ -996,7 +997,7 @@ ExportDialog::end_dialog ()
                }
        }
 
-       session->finalize_audio_export ();
+       session->finalize_export ();
 
        hide_all ();
 
@@ -1017,6 +1018,7 @@ ExportDialog::start_export ()
        */
        
        if (file_entry.get_text().length() == 0) {
+
                sys::path export_file_path = session->session_directory().export_path();
 
                if (!wants_dir()) {
@@ -1229,7 +1231,7 @@ ExportDialog::initSpec(string &filepath)
 {
        spec.path = filepath;
        spec.progress = 0;
-       spec.running = true;
+       spec.running = false;
        spec.stop = false;
        spec.port_map.clear();