Re-integrate export-optimization branch.
[ardour.git] / gtk2_ardour / export_dialog.cc
index 8074b12afd51f98b201a7371fd1f51f55c57cff1..f2feaee44dd1f70bc640ae3c1fff9510360e3478 100644 (file)
@@ -1,5 +1,6 @@
 /*
-    Copyright (C) 1999-2005 Paul Davis 
+    Copyright (C) 2008 Paul Davis
+    Author: Sakari Bergen
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 */
 
-#include <unistd.h>
-#include <utility>
 
-#include <fstream>
+#include <sigc++/signal.h>
 
-#include <samplerate.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/xml++.h>
+#include "pbd/filesystem.h"
 
-#include <gtkmm2ext/utils.h>
-#include <ardour/export.h>
-#include <ardour/sndfile_helpers.h>
-#include <ardour/audio_track.h>
-#include <ardour/audioregion.h>
-#include <ardour/audioengine.h>
-#include <ardour/gdither.h>
-#include <ardour/utils.h>
+#include "ardour/export_status.h"
+#include "ardour/export_handler.h"
 
 #include "export_dialog.h"
-#include "ardour_ui.h"
-#include "public_editor.h"
-#include "keyboard.h"
-
-#include "i18n.h"
-
-#define FRAME_NAME "BaseFrame"
-
-using namespace std;
+#include "gui_thread.h"
 
 using namespace ARDOUR;
-using namespace sigc;
-using namespace Gtk;
-
-static const gchar *sample_rates[] = {
-       N_("22.05kHz"),
-       N_("44.1kHz"),
-       N_("48kHz"),
-       N_("88.2kHz"),
-       N_("96kHz"),
-       N_("192kHz"),
-       0
-};
-
-static const gchar *src_quality[] = {
-       N_("best"),
-       N_("fastest"),
-       N_("linear"),
-       N_("better"),
-       N_("intermediate"),
-       0
-};
-
-static const gchar *dither_types[] = {
-       N_("None"),
-       N_("Rectangular"),
-       N_("Shaped Noise"),
-       N_("Triangular"),
-       0
-};
-
-static const gchar* channel_strings[] = {
-       N_("stereo"), 
-       N_("mono"), 
-       0
-};
-
-static const gchar* cue_file_types[] = {
-       N_("None"), 
-       N_("CUE"),
-       N_("TOC"),
-       0
-};
-
-ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
-       : ArdourDialog ("export dialog"),
-         editor (e),
-         format_table (9, 2),
-         format_frame (_("FORMAT")),
-         sample_rate_label (_("SAMPLE RATE")),
-         src_quality_label (_("CONVERSION QUALITY")),
-         dither_type_label (_("DITHER TYPE")),
-         cue_file_label (_("CD MARKER FILE TYPE")),
-         channel_count_label (_("CHANNELS")),
-         header_format_label (_("FILE TYPE")),
-         bitdepth_format_label (_("SAMPLE FORMAT")),
-         endian_format_label (_("SAMPLE ENDIANNESS")),
-         cuefile_only_checkbox (_("EXPORT CD MARKER FILE ONLY")),
-         file_frame (_("EXPORT TO FILE")),
-         file_browse_button (_("Browse")),
-         ok_button (_("Export")),
-         track_selector_button (_("Specific tracks ..."))
-{
-       guint32 n;
-       guint32 len;
-       guint32 maxlen;
+using namespace PBD;
 
-       audio_region = r;
+ExportDialog::ExportDialog (PublicEditor & editor, Glib::ustring title) :
+  ArdourDialog (title),
+  editor (editor),
 
-       session = 0;
-       
-       set_title (_("ardour: export"));
-       set_wmclass (_("ardour_export"), "Ardour");
-       set_name ("ExportWindow");
-       add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
-       file_selector = 0;
-       spec.running = false;
+  warn_label ("", Gtk::ALIGN_LEFT),
+  list_files_label (_("<span color=\"#ffa755\">Some already existing files will be overwritten.</span>"), Gtk::ALIGN_RIGHT),
+  list_files_button (_("List files"))
+{ }
 
-       file_entry.set_name ("ExportFileNameEntry");
+ExportDialog::~ExportDialog ()
+{ }
 
-       master_list = ListStore::create (exp_cols);
-       master_selector.set_model (master_list);
-
-       master_selector.set_name ("ExportTrackSelector");
-       master_selector.set_size_request (-1, 100);
-       master_selector.append_column(_("Output"), exp_cols.output);
-       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);
-       master_selector.get_column(2)->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE);
-       master_selector.get_selection()->set_mode (Gtk::SELECTION_NONE);
-
-       track_list = ListStore::create (exp_cols);
-       track_selector.set_model (track_list);
-
-       track_selector.set_name ("ExportTrackSelector");
-       track_selector.set_size_request (-1, 130);
-       track_selector.append_column(_("Output"), exp_cols.output);
-       track_selector.append_column_editable(_("Left"), exp_cols.left);
-       track_selector.append_column_editable(_("Right"), exp_cols.right);
-
-       track_selector.get_column(0)->set_min_width(100);
-       track_selector.get_column(1)->set_min_width(40);
-       track_selector.get_column(1)->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE);
-       track_selector.get_column(2)->set_min_width(40);
-       track_selector.get_column(2)->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE);
-       track_selector.get_selection()->set_mode (Gtk::SELECTION_NONE);
-
-       progress_bar.set_name ("ExportProgress");
+void
+ExportDialog::set_session (ARDOUR::Session* s)
+{
+       SessionHandlePtr::set_session (s);
 
-       format_frame.add (format_table);
-       format_frame.set_name (FRAME_NAME);
+       if (!_session) {
+               return;
+       }
 
-       track_scroll.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-       master_scroll.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+       /* Init handler and profile manager */
 
-       get_vbox()->pack_start (file_frame, false, false);
+       handler = _session->get_export_handler ();
+       status = _session->get_export_status ();
+       profile_manager.reset (new ExportProfileManager (*_session));
 
-       hpacker.set_spacing (5);
-       hpacker.set_border_width (5);
-       hpacker.pack_start (format_frame, false, false);
+       /* Possibly init stuff in derived classes */
 
-       if (!audio_region) {
+       init ();
 
-               master_scroll.add (master_selector);
-               track_scroll.add (track_selector);
+       /* Rest of _session related initialization */
 
-               master_scroll.set_size_request (220, 100);
-               track_scroll.set_size_request (220, 100);
+       preset_selector->set_manager (profile_manager);
+       file_notebook->set_session_and_manager (_session, profile_manager);
 
-               
-               
-               /* we may hide some of these later */
-               track_vpacker.pack_start (master_scroll);
-               track_vpacker.pack_start (track_scroll);
-               track_vpacker.pack_start (track_selector_button, Gtk::PACK_EXPAND_PADDING);
+       /* Hand on selection range to profile manager  */
 
-               hpacker.pack_start (track_vpacker);
+       TimeSelection const & time (editor.get_selection().time);
+       if (!time.empty()) {
+               profile_manager->set_selection_range (time.front().start, time.front().end);
+       } else {
+               profile_manager->set_selection_range ();
        }
 
-       get_vbox()->pack_start (hpacker);
-       
-       track_selector_button.set_name ("EditorGTKButton");
-       track_selector_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::track_selector_button_click));
-
-       get_vbox()->pack_start (button_box, false, false);
-       get_vbox()->pack_start (progress_bar, false, false);
-
-       Gtkmm2ext::set_size_request_to_display_given_text (file_entry, X_("Kg/quite/a/reasonable/size/for/files/i/think"), 5, 8);
-
-       file_hbox.set_spacing (5);
-       file_hbox.set_border_width (5);
-       file_hbox.pack_start (file_entry, true, true);
-       file_hbox.pack_start (file_browse_button, false, false);
-
-       file_frame.add (file_hbox);
-       file_frame.set_border_width (5);
-       file_frame.set_name (FRAME_NAME);
-
-       /* pop_strings needs to be created on the stack because set_popdown_strings()
-        * takes a reference. */
-       vector<string> pop_strings = internationalize(sample_rates);
-       Gtkmm2ext::set_popdown_strings (sample_rate_combo, pop_strings);
-       pop_strings = internationalize(sample_rates);
-       Gtkmm2ext::set_popdown_strings (src_quality_combo, pop_strings);
-       pop_strings = internationalize(dither_types);
-       Gtkmm2ext::set_popdown_strings (dither_type_combo, pop_strings);
-       pop_strings = internationalize(channel_strings);
-       Gtkmm2ext::set_popdown_strings (channel_count_combo, pop_strings);
-       pop_strings = internationalize((const char **) sndfile_header_formats_strings);
-       Gtkmm2ext::set_popdown_strings (header_format_combo, pop_strings);
-       pop_strings = internationalize((const char **) sndfile_bitdepth_formats_strings);
-       Gtkmm2ext::set_popdown_strings (bitdepth_format_combo, pop_strings);
-       pop_strings = internationalize((const char **) sndfile_endian_formats_strings);
-       Gtkmm2ext::set_popdown_strings (endian_format_combo, pop_strings);
-       pop_strings = internationalize(cue_file_types);
-       Gtkmm2ext::set_popdown_strings (cue_file_combo, pop_strings);
-
-       /* this will re-sensitized as soon as a non RIFF/WAV
-          header format is chosen.
-       */
-
-       endian_format_combo.set_sensitive (false);
-
-       /* determine longest strings at runtime */
-
-       const guint32 FUDGE = 10; // Combo's are stupid - they steal space from the entry for the button
-
-       maxlen = 0;
-       const char *longest = "gl";
-       string longest_str;
-
-       for (n = 0; n < SNDFILE_HEADER_FORMATS; ++n) {
-               if ((len = strlen (sndfile_header_formats_strings[n])) > maxlen) {
-                       maxlen = len;
-                       longest = sndfile_header_formats_strings[n];
-               }
-       }
+       /* Load states */
 
-       for (n = 0; n < SNDFILE_BITDEPTH_FORMATS; ++n) {
-               if ((len = strlen (sndfile_bitdepth_formats_strings[n])) > maxlen) {
-                       maxlen = len;
-                       longest = sndfile_bitdepth_formats_strings[n];
-               }
-       }
+       profile_manager->load_profile ();
+       sync_with_manager ();
 
-       for (n = 0; n < SNDFILE_ENDIAN_FORMATS; ++n) {
-               if ((len = strlen (sndfile_endian_formats_strings[n])) > maxlen) {
-                       maxlen = len;
-                       longest = sndfile_endian_formats_strings[n];
-               }
-       }
+       /* Warnings */
 
-       longest_str = longest;
+       preset_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::sync_with_manager));
+       timespan_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings));
+       channel_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings));
+       file_notebook->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings));
 
-       /* force ascender + descender */
+       status->Aborting.connect (abort_connection, boost::bind (&ExportDialog::notify_errors, this), gui_context());
 
-       longest_str[0] = 'g';
-       longest_str[1] = 'l';
+       update_warnings ();
+}
 
-       Gtkmm2ext::set_size_request_to_display_given_text (header_format_combo, longest_str.c_str(), 5+FUDGE, 5);
+void
+ExportDialog::init ()
+{
+       init_components ();
+       init_gui ();
 
-       // TRANSLATORS: "slereg" is "stereo" with ascender and descender substituted
-       Gtkmm2ext::set_size_request_to_display_given_text (channel_count_combo, _("slereg"), 5+FUDGE, 5);
+       /* warnings */
 
-/*     header_format_combo.set_focus_on_click (true);
-       bitdepth_format_combo.set_focus_on_click (true);
-       endian_format_combo.set_focus_on_click (true);
-       channel_count_combo.set_focus_on_click (true);
-       src_quality_combo.set_focus_on_click (true);
-       dither_type_combo.set_focus_on_click (true);
-       sample_rate_combo.set_focus_on_click (true);
-       cue_file_combo.set_focus_on_click (true);
-*/
-       dither_type_label.set_name ("ExportFormatLabel");
-       sample_rate_label.set_name ("ExportFormatLabel");
-       src_quality_label.set_name ("ExportFormatLabel");
-       channel_count_label.set_name ("ExportFormatLabel");
-       header_format_label.set_name ("ExportFormatLabel");
-       bitdepth_format_label.set_name ("ExportFormatLabel");
-       endian_format_label.set_name ("ExportFormatLabel");
-       cue_file_label.set_name ("ExportFormatLabel");
-
-       header_format_combo.set_name ("ExportFormatDisplay");
-       bitdepth_format_combo.set_name ("ExportFormatDisplay");
-       endian_format_combo.set_name ("ExportFormatDisplay");
-       channel_count_combo.set_name ("ExportFormatDisplay");
-       dither_type_combo.set_name ("ExportFormatDisplay");
-       src_quality_combo.set_name ("ExportFormatDisplay");
-       sample_rate_combo.set_name ("ExportFormatDisplay");
-       cue_file_combo.set_name ("ExportFormatDisplay");
-
-       cuefile_only_checkbox.set_name ("ExportCheckbox");
-
-       format_table.set_homogeneous (true);
-       format_table.set_border_width (5);
-       format_table.set_col_spacings (5);
-       format_table.set_row_spacings (5);
-
-       if (!audio_region) {
-               format_table.attach (channel_count_label, 0, 1, 0, 1);
-               format_table.attach (channel_count_combo, 0, 1, 1, 2);
-       }
+       warning_widget.pack_start (warn_hbox, true, true, 6);
+       warning_widget.pack_end (list_files_hbox, false, false, 0);
 
-       format_table.attach (header_format_label, 1, 2, 0, 1);
-       format_table.attach (header_format_combo, 1, 2, 1, 2);
+       warn_hbox.pack_start (warn_label, true, true, 16);
+       warn_label.set_use_markup (true);
 
-       format_table.attach (bitdepth_format_label, 0, 1, 2, 3);
-       format_table.attach (bitdepth_format_combo, 0, 1, 3, 4);
+       list_files_hbox.pack_end (list_files_button, false, false, 6);
+       list_files_hbox.pack_end (list_files_label, false, false, 6);
+       list_files_label.set_use_markup (true);
 
-       format_table.attach (endian_format_label, 1, 2, 2, 3);
-       format_table.attach (endian_format_combo, 1, 2, 3, 4);
+       list_files_button.signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::show_conflicting_files));
 
-       format_table.attach (sample_rate_label, 0, 1, 4, 5);
-       format_table.attach (sample_rate_combo, 0, 1, 5, 6);
+       /* Progress indicators */
 
-       format_table.attach (src_quality_label, 1, 2, 4, 5);
-       format_table.attach (src_quality_combo, 1, 2, 5, 6);
+       progress_widget.pack_start (progress_label, false, false, 6);
+       progress_widget.pack_start (progress_bar, false, false, 6);
 
-       format_table.attach (dither_type_label, 0, 1, 6, 7);
-       format_table.attach (dither_type_combo, 0, 1, 7, 8);
+       /* Buttons */
 
-       format_table.attach (cue_file_label, 1, 2, 6, 7);
-       format_table.attach (cue_file_combo, 1, 2, 7, 8);
-       format_table.attach (cuefile_only_checkbox, 1, 2, 8, 9);
+       cancel_button = add_button (Gtk::Stock::CANCEL, RESPONSE_CANCEL);
+       rt_export_button = add_button (_("Realtime Export"), RESPONSE_RT);
+       fast_export_button = add_button (_("Fast Export"), RESPONSE_FAST);
 
+       list_files_button.set_name ("PaddedButton");
 
-       button_box.set_spacing (10);
-       button_box.set_homogeneous (true);
+       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));
 
-       cancel_button.add (cancel_label);
+       /* Done! */
 
-       button_box.pack_start (ok_button, false, true);
-       button_box.pack_start (cancel_button, false, true);
-       
-       ok_button.set_name ("EditorGTKButton");
-       cancel_button.set_name ("EditorGTKButton");
-       file_entry.set_name ("ExportFileDisplay");
-
-       signal_delete_event().connect (mem_fun(*this, &ExportDialog::window_closed));
-       ok_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::do_export));
-       cancel_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::end_dialog));
-       
-       file_browse_button.set_name ("EditorGTKButton");
-       file_browse_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::initiate_browse));
-
-       channel_count_combo.signal_changed().connect (mem_fun(*this, &ExportDialog::channels_chosen));
-       bitdepth_format_combo.signal_changed().connect (mem_fun(*this, &ExportDialog::bitdepth_chosen));
-       header_format_combo.signal_changed().connect (mem_fun(*this, &ExportDialog::header_chosen));
-       sample_rate_combo.signal_changed().connect (mem_fun(*this, &ExportDialog::sample_rate_chosen));
-       cue_file_combo.signal_changed().connect (mem_fun(*this, &ExportDialog::cue_file_type_chosen));
+       show_all_children ();
+       progress_widget.hide_all();
 }
 
-ExportDialog::~ExportDialog()
+void
+ExportDialog::init_gui ()
 {
-       if (file_selector) {
-               delete file_selector;
-       }
+       Gtk::Alignment * preset_align = Gtk::manage (new Gtk::Alignment());
+       preset_align->add (*preset_selector);
+       preset_align->set_padding (0, 12, 0, 0);
+       get_vbox()->pack_start (*preset_align, false, false, 0);
+
+       Gtk::VBox* advanced_vbox = Gtk::manage (new Gtk::VBox());
+       advanced_vbox->set_spacing (12);
+       advanced_vbox->set_border_width (12);
+
+       Gtk::Alignment * timespan_align = Gtk::manage (new Gtk::Alignment());
+       timespan_label = Gtk::manage (new Gtk::Label (_("Time Span"), Gtk::ALIGN_LEFT));
+       timespan_align->add (*timespan_selector);
+       timespan_align->set_padding (0, 12, 18, 0);
+       advanced_vbox->pack_start (*timespan_label, false, false, 0);
+       advanced_vbox->pack_start (*timespan_align, false, false, 0);
+
+       Gtk::Alignment * channels_align = Gtk::manage (new Gtk::Alignment());
+       channels_label = Gtk::manage (new Gtk::Label (_("Channels"), Gtk::ALIGN_LEFT));
+       channels_align->add (*channel_selector);
+       channels_align->set_padding (0, 12, 18, 0);
+       advanced_vbox->pack_start (*channels_label, false, false, 0);
+       advanced_vbox->pack_start (*channels_align, false, false, 0);
+
+       get_vbox()->pack_start (*file_notebook, false, false, 0);
+       get_vbox()->pack_start (warning_widget, false, false, 0);
+       get_vbox()->pack_start (progress_widget, false, false, 0);
+
+       Gtk::Expander* advanced = Gtk::manage (new Gtk::Expander (_("Advanced options")));
+       advanced->add (*advanced_vbox);
+
+       get_vbox()->pack_start (*advanced, false, false);
+
+       Pango::AttrList bold;
+       Pango::Attribute b = Pango::Attribute::create_attr_weight (Pango::WEIGHT_BOLD);
+       bold.insert (b);
+
+       timespan_label->set_attributes (bold);
+       channels_label->set_attributes (bold);
 }
 
 void
-ExportDialog::connect_to_session (Session *s)
+ExportDialog::init_components ()
 {
-       session = s;
-       session->going_away.connect (mem_fun(*this, &Window::hide_all));
-
-       switch (session->frame_rate()) {
-       case 22050:
-               sample_rate_combo.set_active_text (N_("22.05kHz"));
-               break;
-       case 44100:
-               sample_rate_combo.set_active_text (N_("44.1kHz"));
-               break;
-       case 48000:
-               sample_rate_combo.set_active_text (N_("48kHz"));
-               break;
-       case 88200:
-               sample_rate_combo.set_active_text (N_("88.2kHz"));
-               break;
-       case 96000:
-               sample_rate_combo.set_active_text (N_("96kHz"));
-               break;
-       case 192000:
-               sample_rate_combo.set_active_text (N_("192kHz"));
-               break;
-       default:
-               sample_rate_combo.set_active_text (N_("44.1kHz"));
-               break;
-       }
-
-       src_quality_combo.set_sensitive (false);
-
-       set_state();
+       preset_selector.reset (new ExportPresetSelector ());
+       timespan_selector.reset (new ExportTimespanSelectorMultiple (_session, profile_manager));
+       channel_selector.reset (new PortExportChannelSelector (_session, profile_manager));
+       file_notebook.reset (new ExportFileNotebook ());
 }
 
 void
-ExportDialog::set_state()
+ExportDialog::notify_errors ()
 {
-       XMLNode* node = session->instant_xml(X_("ExportDialog"), session->path());
-       XMLProperty* prop;
-
-       if (node) {
-
-               if ((prop = node->property (X_("sample_rate"))) != 0) {
-                       sample_rate_combo.set_active_text(prop->value());
-               }
-               if ((prop = node->property (X_("src_quality"))) != 0) {
-                       src_quality_combo.set_active_text(prop->value());
-               }
-               if ((prop = node->property (X_("dither_type"))) != 0) {
-                       dither_type_combo.set_active_text(prop->value());
-               }
-               if ((prop = node->property (X_("channel_count"))) != 0) {
-                       channel_count_combo.set_active_text(prop->value());
-               }
-               if ((prop = node->property (X_("header_format"))) != 0) {
-                       header_format_combo.set_active_text(prop->value());
-               }
-               if ((prop = node->property (X_("bitdepth_format"))) != 0) {
-                       bitdepth_format_combo.set_active_text(prop->value());
-               }
-               if ((prop = node->property (X_("endian_format"))) != 0) {
-                       endian_format_combo.set_active_text(prop->value());
-               }
-               if ((prop = node->property (X_("filename"))) != 0) {
-                       file_entry.set_text(prop->value());
-               }
-               if ((prop = node->property (X_("cue_file_type"))) != 0) {
-                       cue_file_combo.set_active_text(prop->value());
-               }
-       }
-
-       header_chosen ();
-       bitdepth_chosen();
-       channels_chosen();
-       sample_rate_chosen();
-
-       if (session->master_out()) {
-               track_scroll.hide ();
-       } else {
-               master_scroll.hide ();
-               track_selector_button.hide ();
-       }
-
-       if (!node) {
-               return;
-       }
-
-       if (session->master_out()) {
-               XMLNode* master = find_named_node(*node, (X_("Master")));
-               int nchns;
-
-               if (!master) {
-                       
-                       /* default is to use all */
-                       if (channel_count_combo.get_active_text() == _("mono")) {
-                               nchns = 1;
-                       } else {
-                               nchns = 2;
-                       }
-
-                       TreeModel::Children rows = master_selector.get_model()->children();
-                       for (uint32_t r = 0; r < session->master_out()->n_outputs(); ++r) {
-                               if (nchns == 2) {
-                                       if (r % 2) {
-                                               rows[r][exp_cols.right] = true;
-                                       } else {
-                                               rows[r][exp_cols.left] = true;
-                                       }
-                               } else {
-                                       rows[r][exp_cols.left] = true;
-                               }
-                       }
-
-               } else {
-                       /* XXX use XML state */
-               }
-       }
-
-       XMLNode* tracks = find_named_node(*node, (X_("Tracks")));
-       if (!tracks) {
-               return;
-       }
-       
-       XMLNodeList track_list = tracks->children(X_("Track"));
-       TreeModel::Children rows = track_selector.get_model()->children();
-       TreeModel::Children::iterator ri = rows.begin();
-       TreeModel::Row row;
-
-       for (XMLNodeIterator it = track_list.begin(); it != track_list.end(); ++it, ++ri) {
-               if (ri == rows.end()){
-                       break;
-               }
-
-               XMLNode* track = *it;
-               row = *ri;
-
-               if ((prop = track->property(X_("channel1"))) != 0) {
-                       if (prop->value() == X_("on")) {
-                               row[exp_cols.left] = true;
-                       } else {
-                               row[exp_cols.left] = false;
-                       }
-               }
-
-               if ((prop = track->property(X_("channel2"))) != 0) {
-                       if (prop->value() == X_("on")) {
-                               row[exp_cols.right] = true;
-                       } else {
-                               row[exp_cols.right] = false;
-                       }
-               }
+       if (status->errors()) {
+               Glib::ustring txt = _("Export has been aborted due to an error!\nSee the Log for details.");
+               Gtk::MessageDialog msg (txt, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
+               msg.run();
        }
 }
 
 void
-ExportDialog::save_state()
+ExportDialog::close_dialog ()
 {
-       if (!session) {
-               return;
+       if (status->running) {
+               status->abort();
        }
 
-       XMLNode* node = new XMLNode(X_("ExportDialog"));
-
-       node->add_property(X_("sample_rate"), sample_rate_combo.get_active_text());
-       node->add_property(X_("src_quality"), src_quality_combo.get_active_text());
-       node->add_property(X_("dither_type"), dither_type_combo.get_active_text());
-       node->add_property(X_("channel_count"), channel_count_combo.get_active_text());
-       node->add_property(X_("header_format"), header_format_combo.get_active_text());
-       node->add_property(X_("bitdepth_format"), bitdepth_format_combo.get_active_text());
-       node->add_property(X_("endian_format"), endian_format_combo.get_active_text());
-       node->add_property(X_("filename"), file_entry.get_text());
-       node->add_property(X_("cue_file_type"), cue_file_combo.get_active_text());
-
-       XMLNode* tracks = new XMLNode(X_("Tracks"));
-
-       TreeModel::Children rows = track_selector.get_model()->children();
-       TreeModel::Row row;
-       for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri) {
-               XMLNode* track = new XMLNode(X_("Track"));
-
-               row = *ri;
-               track->add_property(X_("channel1"), row[exp_cols.left] ? X_("on") : X_("off"));
-               track->add_property(X_("channel1"), row[exp_cols.right] ? X_("on") : X_("off"));
+       hide_all ();
+       set_modal (false);
 
-               tracks->add_child_nocopy(*track);
-       }
-       node->add_child_nocopy(*tracks);
-       
-       session->add_instant_xml(*node, session->path());
 }
 
 void
-ExportDialog::set_range (jack_nframes_t start, jack_nframes_t end)
+ExportDialog::sync_with_manager ()
 {
-       spec.start_frame = start;
-       spec.end_frame = end;
+       timespan_selector->sync_with_manager();
+       channel_selector->sync_with_manager();
+       file_notebook->sync_with_manager ();
 
-       if (!audio_region) {
-               // XXX: this is a hack until we figure out what is really wrong
-               session->request_locate (spec.start_frame, false);
-       }
-}
-
-gint
-ExportDialog::progress_timeout ()
-{
-       progress_bar.set_fraction (spec.progress/100);
-       return TRUE;
-}
-
-void*
-ExportDialog::_export_region_thread (void *arg)
-{
-       PBD::ThreadCreated (pthread_self(), X_("Export Region"));
-
-       static_cast<ExportDialog*>(arg)->export_region ();
-       return 0;
+       update_warnings ();
 }
 
 void
-ExportDialog::export_region ()
+ExportDialog::update_warnings ()
 {
-       audio_region->exportme (*session, spec);
-}
+       /* Reset state */
 
-void
-frames_to_cd_frames_string (char* buf, jack_nframes_t when, jack_nframes_t fr)
-{
+       warn_string = "";
+       warn_label.set_markup (warn_string);
 
-  long unsigned int remainder;
-  int mins, secs, frames;
+       list_files_hbox.hide ();
+       list_files_string = "";
 
-       mins = when / (60 * fr);
-       remainder = when - (mins * 60 * fr);
-       secs = remainder / fr;
-       remainder -= secs * fr;
-       frames = remainder / (fr / 75);
-       sprintf (buf, " %02d:%02d:%02d", mins, secs, frames);
+       fast_export_button->set_sensitive (true);
+       rt_export_button->set_sensitive (true);
 
-}
+       /* Add new warnings */
 
-struct LocationSortByStart {
-    bool operator() (Location *a, Location *b) {
-           return a->start() < b->start();
-    }
-};
+       boost::shared_ptr<ExportProfileManager::Warnings> warnings = profile_manager->get_warnings();
 
-void
-ExportDialog::export_toc_file (Locations::LocationList& locations, const string& path)
-{
-       
-        string filepath = path + ".toc";
-       ofstream out (filepath.c_str());
-       long unsigned int last_end_time = spec.start_frame, last_start_time = spec.start_frame;
-       int numtracks = 0;
-       gchar buf[18];
-
-       if (!out) {
-               error << string_compose(_("Editor: cannot open \"%1\" as export file for CD toc file"), filepath) << endmsg;
-               return;
+       for (std::list<Glib::ustring>::iterator it = warnings->errors.begin(); it != warnings->errors.end(); ++it) {
+               add_error (*it);
        }
-       out << "CD_DA" << endl;
-       out << "CD_TEXT {" << endl << "  LANGUAGE_MAP {" << endl << "    0 : EN" << endl << "  }" << endl;
-       out << "  LANGUAGE 0 {" << endl << "    TITLE \"" << session->name() << "\"" << endl << "  }" << endl << "}" << endl;
-
-       Locations::LocationList::iterator i;
-       Locations::LocationList temp;
-
-       for (i = locations.begin(); i != locations.end(); ++i) {
-         if ((*i)->start() >= spec.start_frame && (*i)->end() <= spec.end_frame && (*i)->is_cd_marker() && !(*i)->is_end()) {
-           temp.push_back (*i);
-           if (!(*i)->is_mark()) {
-             numtracks ++;
-           }
-         }
+
+       for (std::list<Glib::ustring>::iterator it = warnings->warnings.begin(); it != warnings->warnings.end(); ++it) {
+               add_warning (*it);
        }
 
-       if (numtracks == 0 ) {
-                   /* the user supplied no track markers.
-                      we now treat the session as one track.*/
-
-                   out << endl << "TRACK AUDIO" << endl;
-                  
-                   out << "COPY" << endl;
-
-                   out << "NO PRE_EMPHASIS" << endl;
-   
-                   /* XXX add session properties for catalog etc.
-                      (so far only the session name is used) */
-                   
-                   out << "CD_TEXT {" << endl << "  LANGUAGE 0 {" << endl << "     TITLE \"" << session->name() << "\"" << endl;
-                   out << "  }" << endl << "}" << endl;
-
-                   out << "FILE \"" << path << "\" ";
-                   out << "00:00:00 " ;
-                   frames_to_cd_frames_string (buf, spec.end_frame - spec.start_frame, session->frame_rate());
-                   out << buf << endl;
-                   out << "START 00:00:00" << endl;
-
-                   last_start_time = spec.start_frame;
-                   last_end_time = spec.end_frame;
-       } 
-
-       if (temp.size()) {
-               LocationSortByStart cmp;
-               temp.sort (cmp);
-
-               for (i = temp.begin(); i != temp.end(); ++i) {
-       
-                     if (!(*i)->is_mark()) {
-                       /*this is a track */
-                       out << endl << "TRACK AUDIO" << endl;
-
-                       if ((*i)->cd_info.find("scms") != (*i)->cd_info.end())  {
-                         out << "NO ";
-                       }
-                       out << "COPY" << endl;
-
-                       if ((*i)->cd_info.find("preemph") != (*i)->cd_info.end())  {
-                         out << "PRE_EMPHASIS" << endl;
-                       } else {
-                         out << "NO PRE_EMPHASIS" << endl;
-                       }
-
-                       if ((*i)->cd_info.find("isrc") != (*i)->cd_info.end())  {
-                         out << "ISRC \"" << (*i)->cd_info["isrc"] << "\"" << endl;
-                       }
-
-                       out << "CD_TEXT {" << endl << "  LANGUAGE 0 {" << endl << "     TITLE \"" << (*i)->name() << "\"" << endl;
-                       if ((*i)->cd_info.find("performer") != (*i)->cd_info.end()) {
-                         out << "     PERFORMER \"" << (*i)->cd_info["performer"]  << "\"" << endl;
-                       }
-                       if ((*i)->cd_info.find("string_composer") != (*i)->cd_info.end()) {
-                         out  << "     COMPOSER \"" << (*i)->cd_info["string_composer"] << "\"" << endl;
-                       }
-
-                       if ((*i)->cd_info.find("isrc") != (*i)->cd_info.end()) {                          
-                         out  << "     ISRC \"";
-                         out << (*i)->cd_info["isrc"].substr(0,2) << "-";
-                         out << (*i)->cd_info["isrc"].substr(2,3) << "-";
-                         out << (*i)->cd_info["isrc"].substr(5,2) << "-";
-                         out << (*i)->cd_info["isrc"].substr(7,5) << "\"" << endl;
-                       }
-
-                       out << "  }" << endl << "}" << endl;
-
-                       frames_to_cd_frames_string (buf, last_end_time - spec.start_frame, session->frame_rate());
-                       out << "FILE \"" << path << "\" " << buf;
-
-                       frames_to_cd_frames_string (buf, (*i)->end() - last_end_time, session->frame_rate());
-                       out << buf << endl;
-
-                       frames_to_cd_frames_string (buf, (*i)->start() - last_end_time, session->frame_rate());
-                       out << "START" << buf << endl;
-                       
-                       last_start_time = (*i)->start();
-                       last_end_time = (*i)->end();
-                
-
-                     } else  if ((*i)->start() < last_end_time) {
-                       /* this is an index within a track */
-                       
-                       frames_to_cd_frames_string (buf, (*i)->start() - last_start_time, session->frame_rate());
-                       out << "INDEX" << buf << endl;
-                     }
+       if (!warnings->conflicting_filenames.empty()) {
+               list_files_hbox.show ();
+               for (std::list<Glib::ustring>::iterator it = warnings->conflicting_filenames.begin(); it != warnings->conflicting_filenames.end(); ++it) {
+                       Glib::ustring::size_type pos = it->find_last_of ("/");
+                       list_files_string += "\n" + it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>";
                }
        }
-       
 }
 
 void
-ExportDialog::export_cue_file (Locations::LocationList& locations, const string& path)
+ExportDialog::show_conflicting_files ()
 {
-        string filepath = path + ".cue";
-       ofstream out (filepath.c_str());
-       gchar buf[18];
-       long unsigned int last_track_end = spec.start_frame;
-       int numtracks = 0, tracknum = 0, indexnum = 0;
-
-       if (!out) {
-               error << string_compose(_("Editor: cannot open \"%1\" as export file for CD cue file"), filepath) << endmsg;
-               return;
-       }
+       ArdourDialog dialog (_("Files that will be overwritten"), true);
 
-       Locations::LocationList::iterator i;
-       Locations::LocationList temp;
+       Gtk::Label label ("", Gtk::ALIGN_LEFT);
+       label.set_use_markup (true);
+       label.set_markup (list_files_string);
 
-       for (i = locations.begin(); i != locations.end(); ++i) {
-               if ((*i)->start() >= spec.start_frame && (*i)->end() <= spec.end_frame && (*i)->is_cd_marker() && !(*i)->is_end()) {
-                       temp.push_back (*i);
-                       if (!(*i)->is_mark()) {
-                               numtracks++;
-                       }
-               }
-       }
-       
-       out << "REM Cue file generated by Ardour" << endl;
-       out << "TITLE \"" << session->name() << "\"" << endl;
+       dialog.get_vbox()->pack_start (label);
+       dialog.add_button (Gtk::Stock::OK, 0);
+       dialog.show_all_children ();
 
-       if ((header_format_combo.get_active_text() == N_("WAV"))) {
-                 out << "FILE " << path  << " WAVE" << endl;
-       } else {
-                 out << "FILE " << path  << ' ' << (header_format_combo.get_active_text()) << endl;
-       }
-
-       if (numtracks == 0) {
-                   /* the user has supplied no track markers.
-                      the entire export is treated as one track. 
-                   */
-
-                 numtracks++;
-                 tracknum++;
-                 indexnum = 0;
-                 out << endl << "TRACK " << tracknum << " AUDIO" << endl;
-                 out << "FLAGS " ;
-                 
-                 out << "DCP " << endl;                   
-                 
-                 /* use the session name*/
-                 
-                 if (session->name() != "") {
-                   out << "TITLE \"" << session->name() << "\"" << endl;
-                 }           
-                 
-                 /* no pregap in this case */
-
-                 out << "INDEX 00 00:00:00" << endl;
-                 indexnum++;
-                 out << "INDEX 01 00:00:00" << endl;
-                 indexnum++;
-                 last_track_end = spec.end_frame;
-       }
-
-       if (temp.size()) {
-               LocationSortByStart cmp;
-               temp.sort (cmp);
-
-               for ( i = temp.begin(); i != temp.end(); ++i) {
-
-                   if (!(*i)->is_mark() && ((*i)->start() >= last_track_end)) {
-                     /* this is a track and it doesn't start inside another one*/
-                     
-                     tracknum++;
-                     indexnum = 0;
-                     out << endl << "TRACK " << tracknum << " AUDIO" << endl;
-                     out << "FLAGS " ;
-                     
-                     if ((*i)->cd_info.find("scms") != (*i)->cd_info.end())  {
-                       out << "SCMS ";
-                     } else {
-                       out << "DCP ";
-                     }
-                     
-                     if ((*i)->cd_info.find("preemph") != (*i)->cd_info.end())  {
-                       out << "PRE";
-                     }
-                     out << endl;
-                     
-                     if ((*i)->cd_info.find("isrc") != (*i)->cd_info.end())  {
-                       out << "ISRC " << (*i)->cd_info["isrc"] << endl;
-                       
-                     }
-                     if ((*i)->name() != "") {
-                       out << "TITLE \"" << (*i)->name() << "\"" << endl;
-                     }       
-                     
-                     if ((*i)->cd_info.find("performer") != (*i)->cd_info.end()) {
-                       out << "PERFORMER \"" <<  (*i)->cd_info["performer"] << "\"" << endl;
-                     }
-                     
-                     if ((*i)->cd_info.find("string_composer") != (*i)->cd_info.end()) {
-                       out << "SONGWRITER \"" << (*i)->cd_info["string_composer"]  << "\"" << endl;
-                     }
-                       snprintf (buf, sizeof(buf), "INDEX %02d", indexnum);
-                       out << buf;
-                       frames_to_cd_frames_string (buf, last_track_end - spec.start_frame, session->frame_rate());
-                       out << buf << endl;
-                       indexnum++;
-                       last_track_end = (*i)->end();
-                   } 
-                   if ((tracknum > 0) && ((*i)->start() < last_track_end)) {
-                     /*this is an index and it lies within a track*/
-                     snprintf (buf, sizeof(buf), "INDEX %02d", indexnum);
-                     out << buf;
-                     frames_to_cd_frames_string (buf,(*i)->start() - spec.start_frame, session->frame_rate());
-                     out << buf << endl;
-                     indexnum++;
-                   }
-               }
-       }
-       
+       dialog.run();
 }
 
 void
-ExportDialog::do_export_cd_markers (const string& path,const string& cuefile_type)
+ExportDialog::export_rt ()
 {
-       if (cuefile_type == "TOC") {
-               session->locations()->apply (*this, &ExportDialog::export_toc_file, path);      
-       } else {
-               session->locations()->apply (*this, &ExportDialog::export_cue_file, path);
-       }
+       profile_manager->prepare_for_export ();
+       handler->do_export (true);
+       show_progress ();
 }
 
-
 void
-ExportDialog::do_export ()
+ExportDialog::export_fw ()
 {
-       ok_button.set_sensitive(false);
-       save_state();
-
-       if (cue_file_combo.get_active_text () != _("None")) {
-               do_export_cd_markers (file_entry.get_text(), cue_file_combo.get_active_text ());
-       }
-
-       if (cuefile_only_checkbox.get_active()) {
-               end_dialog ();
-               return;
-       }
-
-       set_modal (true);
-       
-       spec.path = file_entry.get_text();
-       spec.progress = 0;
-       spec.running = true;
-       spec.stop = false;
-       spec.port_map.clear();
-       
-       if (channel_count_combo.get_active_text() == _("mono")) {
-               spec.channels = 1;
-       } else {
-               spec.channels = 2;
-       }
-
-       spec.format = 0;
-
-       spec.format |= sndfile_header_format_from_string (header_format_combo.get_active_text ());
-       
-       if ((spec.format & SF_FORMAT_WAV) == 0) {
-               /* RIFF/WAV specifies endianess */
-               spec.format |= sndfile_endian_format_from_string (endian_format_combo.get_active_text ());
-       }
-
-       spec.format |= sndfile_bitdepth_format_from_string (bitdepth_format_combo.get_active_text ());
-
-       string sr_str = sample_rate_combo.get_active_text();
-       if (sr_str == N_("22.05kHz")) {
-               spec.sample_rate = 22050;
-       } else if (sr_str == N_("44.1kHz")) {
-               spec.sample_rate = 44100;
-       } else if (sr_str == N_("48kHz")) {
-               spec.sample_rate = 48000;
-       } else if (sr_str == N_("88.2kHz")) {
-               spec.sample_rate = 88200;
-       } else if (sr_str == N_("96kHz")) {
-               spec.sample_rate = 96000;
-       } else if (sr_str == N_("192kHz")) {
-               spec.sample_rate = 192000;
-       } else {
-               spec.sample_rate = session->frame_rate();
-       }
-       
-       string src_str = src_quality_combo.get_active_text();
-       if (src_str == _("fastest")) {
-               spec.src_quality = SRC_ZERO_ORDER_HOLD;
-       } else if (src_str == _("linear")) {
-               spec.src_quality = SRC_LINEAR;
-       } else if (src_str == _("better")) {
-               spec.src_quality = SRC_SINC_FASTEST;
-       } else if (src_str == _("intermediate")) {
-               spec.src_quality = SRC_SINC_MEDIUM_QUALITY;
-       } else {
-               spec.src_quality = SRC_SINC_BEST_QUALITY;
-       }
+       profile_manager->prepare_for_export ();
+       handler->do_export (false);
+       show_progress ();
+}
 
-       string dither_str = dither_type_combo.get_active_text();
-       if (dither_str == _("None")) {
-               spec.dither_type = GDitherNone;
-       } else if (dither_str == _("Rectangular")) {
-               spec.dither_type = GDitherRect;
-       } else if (dither_str == _("Triangular")) {
-               spec.dither_type = GDitherTri;
-       } else {
-               spec.dither_type = GDitherShaped;
-       } 
-
-       if (!audio_region) {
-
-               uint32_t chan=0;
-               Port *last_port = 0;
-               
-               TreeModel::Children rows = master_selector.get_model()->children();
-               TreeModel::Children::iterator ri;
-               TreeModel::Row row;
-               for (ri = rows.begin(); ri != rows.end(); ++ri) {
-                       row = *ri;
-                       Port* port = row[exp_cols.port];
-                       
-                       if (last_port != port) {
-                               chan = 0;
-                       }
-                       
-                       if (row[exp_cols.left]) {
-                               spec.port_map[0].push_back (std::pair<Port*,uint32_t>(port, chan));
-                       } 
-                       
-                       if (spec.channels == 2) {
-                               if (row[exp_cols.right]) {
-                                       spec.port_map[1].push_back (std::pair<Port*,uint32_t>(port, chan));
-                               }
-                       }
-               }
+void
+ExportDialog::show_progress ()
+{
+       status->running = true;
 
-               chan = 0;
-
-               rows = track_selector.get_model()->children();
-               for (ri = rows.begin(); ri != rows.end(); ++ri) {
-                       row = *ri;
-                       
-                       Port* port = row[exp_cols.port];
-                       
-                       if (last_port != port) {
-                               chan = 0;
-                       }
-                       
-                       if (row[exp_cols.left]) {
-                               spec.port_map[0].push_back (std::pair<Port*,uint32_t>(port, chan));
-                       } 
-                       
-                       if (spec.channels == 2) {
-                               if (row[exp_cols.right]) {
-                                       spec.port_map[1].push_back (std::pair<Port*,uint32_t>(port, chan));
-                               }
-                               
-                       }
-                       
-                       last_port = port;
-                       ++chan;
-               }
-       }
+       cancel_button->set_label (_("Stop Export"));
+       rt_export_button->set_sensitive (false);
+       fast_export_button->set_sensitive (false);
 
-       progress_connection = Glib::signal_timeout().connect (mem_fun(*this, &ExportDialog::progress_timeout), 100);
-       cancel_label.set_text (_("Stop Export"));
-
-       if (!audio_region) {
-               if (session->start_audio_export (spec)) {
-                       goto out;
-               }
-       } else {
-               pthread_t thr;
-               pthread_create_and_store ("region export", &thr, 0, ExportDialog::_export_region_thread, this);
-       }
+       progress_bar.set_fraction (0.0);
+       warning_widget.hide_all();
+       progress_widget.show ();
+       progress_widget.show_all_children ();
+       progress_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ExportDialog::progress_timeout), 100);
 
        gtk_main_iteration ();
-       while (spec.running) {
+       while (status->running) {
                if (gtk_events_pending()) {
                        gtk_main_iteration ();
                } else {
@@ -1033,255 +312,116 @@ ExportDialog::do_export ()
                }
        }
        
-  out:
-       progress_connection.disconnect ();
-       end_dialog ();
+       if (!status->aborted()) {
+               status->finish ();
+       }
 }
-       
 
-void
-ExportDialog::end_dialog ()
+gint
+ExportDialog::progress_timeout ()
 {
-
-       if (spec.running) {
-               spec.stop = true;
-
-               while (spec.running) {
-                       if (gtk_events_pending()) {
-                               gtk_main_iteration ();
-                       } else {
-                               usleep (10000);
-                       }
-               }
-       }
-
-       session->engine().freewheel (false);
-
-       hide_all ();
-
-       if (file_selector) {
-               file_selector->hide_all ();
+       switch (status->stage) {
+         case export_None:
+               progress_label.set_text ("");
+               break;
+         case export_ReadTimespan:
+               progress_label.set_text (string_compose (_("Reading timespan %1 of %2"), status->timespan, status->total_timespans));
+               break;
+         case export_PostProcess:
+               progress_label.set_text (string_compose (_("Processing file %2 of %3 (%1) from timespan %4 of %5"),
+                                                        file_notebook->get_nth_format_name (status->format),
+                                                        status->format, status->total_formats,
+                                                        status->timespan, status->total_timespans));
+               break;
+         case export_Write:
+               progress_label.set_text (string_compose (_("Encoding file %2 of %3 (%1) from timespan %4 of %5"),
+                                                        file_notebook->get_nth_format_name (status->format),
+                                                        status->format, status->total_formats,
+                                                        status->timespan, status->total_timespans));
+               break;
        }
 
-       set_modal (false);
-       ok_button.set_sensitive(true);
+       progress_bar.set_fraction (status->progress);
+       return TRUE;
 }
 
 void
-ExportDialog::start_export ()
+ExportDialog::add_error (Glib::ustring const & text)
 {
-       if (session == 0) {
-               return;
-       }
-
-       /* If it the filename hasn't been set before, use the
-          directory above the current session as a default
-          location for the export.  
-       */
-       
-       if (file_entry.get_text().length() == 0) {
-               string dir = session->path();
-               string::size_type last_slash;
-               
-               if ((last_slash = dir.find_last_of ('/')) != string::npos) {
-                       dir = dir.substr (0, last_slash+1);
-               }
-               
-               file_entry.set_text (dir);
-       }
-       
-       progress_bar.set_fraction (0);
-       cancel_label.set_text (_("Cancel"));
+       fast_export_button->set_sensitive (false);
+       rt_export_button->set_sensitive (false);
 
-       show_all ();
-
-       if (session->master_out()) {
-               track_scroll.hide ();
+       if (warn_string.empty()) {
+               warn_string = _("<span color=\"#ffa755\">Error: ") + text + "</span>";
        } else {
-               master_scroll.hide ();
-               track_selector_button.hide ();
+               warn_string = _("<span color=\"#ffa755\">Error: ") + text + "</span>\n" + warn_string;
        }
+
+       warn_label.set_markup (warn_string);
 }
 
 void
-ExportDialog::header_chosen ()
+ExportDialog::add_warning (Glib::ustring const & text)
 {
-       if (sndfile_header_format_from_string (header_format_combo.get_active_text ()) == SF_FORMAT_WAV) {
-               endian_format_combo.set_sensitive (false);
+       if (warn_string.empty()) {
+               warn_string = _("<span color=\"#ffa755\">Warning: ") + text + "</span>";
        } else {
-               endian_format_combo.set_sensitive (true);
+               warn_string = warn_string + _("\n<span color=\"#ffa755\">Warning: ") + text + "</span>";
        }
+
+       warn_label.set_markup (warn_string);
 }
 
-void
-ExportDialog::bitdepth_chosen ()
-{
-       int format = sndfile_bitdepth_format_from_string (bitdepth_format_combo.get_active_text ());    
-       switch (format) {
-       case SF_FORMAT_PCM_24:
-       case SF_FORMAT_PCM_32:
-       case SF_FORMAT_FLOAT:
-               dither_type_combo.set_sensitive (false);
-               break;
+/*** Dialog specializations ***/
 
-       default:
-               dither_type_combo.set_sensitive (true);
-               break;
-       }
-}
+ExportRangeDialog::ExportRangeDialog (PublicEditor & editor, Glib::ustring range_id) :
+  ExportDialog (editor, _("Export Range")),
+  range_id (range_id)
+{}
 
 void
-ExportDialog::cue_file_type_chosen ()
+ExportRangeDialog::init_components ()
 {
-       if (cue_file_combo.get_active_text () != "None") {
-               cuefile_only_checkbox.set_sensitive (true);
-       } else {
-               cuefile_only_checkbox.set_active (false);
-               cuefile_only_checkbox.set_sensitive (false);
-       }
+       preset_selector.reset (new ExportPresetSelector ());
+       timespan_selector.reset (new ExportTimespanSelectorSingle (_session, profile_manager, range_id));
+       channel_selector.reset (new PortExportChannelSelector (_session, profile_manager));
+       file_notebook.reset (new ExportFileNotebook ());
 }
 
-void
-ExportDialog::sample_rate_chosen ()
-{
-       string sr_str = sample_rate_combo.get_active_text();
-       jack_nframes_t rate;
-
-       if (sr_str == N_("22.05kHz")) {
-               rate = 22050;
-       } else if (sr_str == N_("44.1kHz")) {
-               rate = 44100;
-       } else if (sr_str == N_("48kHz")) {
-               rate = 48000;
-       } else if (sr_str == N_("88.2kHz")) {
-               rate = 88200;
-       } else if (sr_str == N_("96kHz")) {
-               rate = 96000;
-       } else if (sr_str == N_("192kHz")) {
-               rate = 192000;
-       } else {
-               rate = session->frame_rate();
-       }
-               
-       if (rate != session->frame_rate()) {
-               src_quality_combo.set_sensitive (true);
-       } else {
-               src_quality_combo.set_sensitive (false);
-       }
-}
+ExportSelectionDialog::ExportSelectionDialog (PublicEditor & editor) :
+  ExportDialog (editor, _("Export Selection"))
+{}
 
 void
-ExportDialog::channels_chosen ()
+ExportSelectionDialog::init_components ()
 {
-       bool mono;
-
-       mono = (channel_count_combo.get_active_text() == _("mono"));
-
-       if (mono) {
-               track_selector.get_column(2)->set_visible(false);
-               track_selector.get_column(1)->set_title(_("Export"));
-
-               if (session->master_out()) {
-                       master_selector.get_column(2)->set_visible(false);
-                       master_selector.get_column(1)->set_title(_("Export"));
-               }
-
-       } else {
-               track_selector.get_column(2)->set_visible(true);
-               track_selector.get_column(1)->set_title(_("Left"));
-
-               if (session->master_out()) {
-                       master_selector.get_column(2)->set_visible(true);
-                       master_selector.get_column(1)->set_title(_("Left"));
-               }
-       }
-
-       fill_lists();
+       preset_selector.reset (new ExportPresetSelector ());
+       timespan_selector.reset (new ExportTimespanSelectorSingle (_session, profile_manager, X_("selection")));
+       channel_selector.reset (new PortExportChannelSelector (_session, profile_manager));
+       file_notebook.reset (new ExportFileNotebook ());
 }
 
-void
-ExportDialog::fill_lists ()
-{
-       track_list->clear();
-       master_list->clear();
-       
-       Session::RouteList routes = session->get_routes ();
+ExportRegionDialog::ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track) :
+  ExportDialog (editor, _("Export Region")),
+  region (region),
+  track (track)
+{}
 
-       for (Session::RouteList::iterator ri = routes.begin(); ri != routes.end(); ++ri) {
-
-               Route* route = (*ri);
-               
-               if (route->hidden()) {
-                       continue;
-               }
-
-               for (uint32_t i=0; i < route->n_outputs(); ++i) {
-                       string name;
-                       if (route->n_outputs() == 1) {
-                               name = route->name();
-                       } else {
-                               name = string_compose("%1: out-%2", route->name(), i+1);
-                       }
-
-                       if (route == session->master_out()) {
-                               TreeModel::iterator iter = master_list->append();
-                               TreeModel::Row row = *iter;
-                               row[exp_cols.output] = name;
-                               row[exp_cols.left] = false;
-                               row[exp_cols.right] = false;
-                               row[exp_cols.port] = route->output (i);
-                       } else {
-                               TreeModel::iterator iter = track_list->append();
-                               TreeModel::Row row = *iter;
-                               row[exp_cols.output] = name;
-                               row[exp_cols.left] = false;
-                               row[exp_cols.right] = false;
-                               row[exp_cols.port] = route->output (i);
-                       }
-               }
-       }
-}
-
-gint
-ExportDialog::window_closed (GdkEventAny *ignored)
-{
-       end_dialog ();
-       return TRUE;
-}
 void
-ExportDialog::initiate_browse ()
+ExportRegionDialog::init_gui ()
 {
-       if (file_selector == 0) {
-               file_selector = new FileSelection;
-               file_selector->set_modal (true);
+       ExportDialog::init_gui ();
 
-               file_selector->get_cancel_button()->signal_clicked().connect (bind (mem_fun(*this, &ExportDialog::finish_browse), -1));
-               file_selector->get_ok_button()->signal_clicked().connect (bind (mem_fun(*this, &ExportDialog::finish_browse), 1));
-       }
-       file_selector->show_all ();
+       channels_label->set_text (_("Source"));
 }
 
 void
-ExportDialog::finish_browse (int status)
+ExportRegionDialog::init_components ()
 {
-       if (file_selector) {
-               if (status > 0) {
-                       string result = file_selector->get_filename();
-                       
-                       if (result.length()) {
-                               file_entry.set_text (result);
-                       }
-               }
-               file_selector->hide_all();
-       }
-}
+       Glib::ustring loc_id = profile_manager->set_single_range (region.position(), region.position() + region.length(), region.name());
 
-void
-ExportDialog::track_selector_button_click ()
-{
-       if (track_scroll.is_visible ()) {
-               track_scroll.hide ();
-       } else {
-               track_scroll.show_all ();
-       }
+       preset_selector.reset (new ExportPresetSelector ());
+       timespan_selector.reset (new ExportTimespanSelectorSingle (_session, profile_manager, loc_id));
+       channel_selector.reset (new RegionExportChannelSelector (_session, profile_manager, region, track));
+       file_notebook.reset (new ExportFileNotebook ());
 }