No-op; some comments, remove some unused stuff, minor tidying up.

git-svn-id: svn://localhost/ardour2/branches/3.0@12616 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 22 deletions

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 9da584307b..71f71fe3b8 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -127,17 +127,13 @@ ExportDialog::init ()
 	/* Buttons */
 
 	cancel_button = add_button (Gtk::Stock::CANCEL, RESPONSE_CANCEL);
-	// Realtime export is disabled for now, as it will most probably not work
-	//rt_export_button = add_button (_("Realtime Export"), RESPONSE_RT);
-	//fast_export_button = add_button (_("Fast Export"), RESPONSE_FAST);
-	fast_export_button = add_button (_("Export"), RESPONSE_FAST);
+	export_button = add_button (_("Export"), RESPONSE_FAST);
 	set_default_response (RESPONSE_FAST);
 
 	list_files_button.set_name ("PaddedButton");
 
 	cancel_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::close_dialog));
-	//rt_export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::export_rt));
-	fast_export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::export_fw));
+	export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::do_export));
 
 	/* Done! */
 
@@ -262,8 +258,7 @@ ExportDialog::update_warnings_and_example_filename ()
 	list_files_hbox.hide ();
 	list_files_string = "";
 
-	fast_export_button->set_sensitive (true);
-	//rt_export_button->set_sensitive (true);
+	export_button->set_sensitive (true);
 
 	/* Add new warnings */
 
@@ -307,18 +302,10 @@ ExportDialog::show_conflicting_files ()
 }
 
 void
-ExportDialog::export_rt ()
+ExportDialog::do_export ()
 {
 	profile_manager->prepare_for_export ();
-	handler->do_export (true);
-	show_progress ();
-}
-
-void
-ExportDialog::export_fw ()
-{
-	profile_manager->prepare_for_export ();
-	handler->do_export (false);
+	handler->do_export ();
 	show_progress ();
 }
 
@@ -328,8 +315,7 @@ ExportDialog::show_progress ()
 	status->running = true;
 
 	cancel_button->set_label (_("Stop Export"));
-	//rt_export_button->set_sensitive (false);
-	fast_export_button->set_sensitive (false);
+	export_button->set_sensitive (false);
 
 	progress_bar.set_fraction (0.0);
 	warning_widget.hide_all();
@@ -381,8 +367,7 @@ ExportDialog::progress_timeout ()
 void
 ExportDialog::add_error (string const & text)
 {
-	fast_export_button->set_sensitive (false);
-	//rt_export_button->set_sensitive (false);
+	export_button->set_sensitive (false);
 
 	if (warn_string.empty()) {
 		warn_string = _("<span color=\"#ffa755\">Error: ") + text + "</span>";