Merge branch 'master' into windows
[ardour.git] / gtk2_ardour / export_dialog.cc
index e5493a2272ae11b172d574b39fb9f7a46a812dbf..6351c512c19cc1d0dee757e3fd72e50a0cfa9396 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
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
-
 */
 
-#include <unistd.h>
-#include <utility>
-#include <sys/stat.h>
-#include <fstream>
 
-#include <samplerate.h>
+#include <sigc++/signal.h>
 
-#include <pbd/convert.h>
-#include <pbd/xml++.h>
+#include <gtkmm/messagedialog.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/audioregion.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 "gui_thread.h"
+#include "nag.h"
 
 #include "i18n.h"
 
-#define FRAME_NAME "BaseFrame"
-
-using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
-using namespace Gtk;
-
-using PBD::internationalize;
-
-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)
-       : ArdourDialog ("export dialog"),
-         editor (e),
-         format_table (9, 2),
-         format_frame (_("Format")),
-         cue_file_label (_("CD Marker File Type"), 1.0, 0.5),
-         channel_count_label (_("Channels"), 1.0, 0.5),
-         header_format_label (_("File Type"), 1.0, 0.5),
-         bitdepth_format_label (_("Sample Format"), 1.0, 0.5),
-         endian_format_label (_("Sample Endianness"), 1.0, 0.5),
-         sample_rate_label (_("Sample Rate"), 1.0, 0.5),
-         src_quality_label (_("Conversion Quality"), 1.0, 0.5),
-         dither_type_label (_("Dither Type"), 1.0, 0.5),
-         cuefile_only_checkbox (_("Export CD Marker File Only")),
-         file_frame (_("Export to File")),
-         file_browse_button (_("Browse")),
-         track_selector_button (_("Specific tracks ..."))
+using std::string;
+
+ExportDialog::ExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type)
+  : ArdourDialog (title)
+  , type (type)
+  , editor (editor)
+
+  , 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"))
+{ }
+
+ExportDialog::~ExportDialog ()
+{ }
+
+void
+ExportDialog::set_session (ARDOUR::Session* s)
 {
-       guint32 n;
-       guint32 len;
-       guint32 maxlen;
-
-       session = 0;
-       track_and_master_selection_allowed = true;
-       channel_count_selection_allowed = true;
-       export_cd_markers_allowed = true;
-       
-       set_title (_("ardour: export"));
-       set_wmclass (_("ardour_export"), "Ardour");
-       set_name ("ExportWindow");
-       add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
-       spec.running = false;
-
-       file_entry.set_name ("ExportFileNameEntry");
-
-       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");
-
-       format_frame.add (format_table);
-       format_frame.set_name (FRAME_NAME);
-
-       track_scroll.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-       master_scroll.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-
-       get_vbox()->pack_start (file_frame, false, false);
-
-       hpacker.set_spacing (5);
-       hpacker.set_border_width (5);
-       hpacker.pack_start (format_frame, false, false);
-
-       master_scroll.add (master_selector);
-       track_scroll.add (track_selector);
-
-       master_scroll.set_size_request (220, 100);
-       track_scroll.set_size_request (220, 100);
-               
-       /* 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);
-
-       hpacker.pack_start (track_vpacker);
-
-       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 (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);
-       sample_rate_combo.set_active_text (pop_strings.front());
-       pop_strings = internationalize(src_quality);
-       Gtkmm2ext::set_popdown_strings (src_quality_combo, pop_strings);
-       src_quality_combo.set_active_text (pop_strings.front());
-       pop_strings = internationalize(dither_types);
-       Gtkmm2ext::set_popdown_strings (dither_type_combo, pop_strings);
-       dither_type_combo.set_active_text (pop_strings.front());
-       pop_strings = internationalize(channel_strings);
-       Gtkmm2ext::set_popdown_strings (channel_count_combo, pop_strings);
-       channel_count_combo.set_active_text (pop_strings.front());
-       pop_strings = internationalize((const char **) sndfile_header_formats_strings);
-       Gtkmm2ext::set_popdown_strings (header_format_combo, pop_strings);
-       header_format_combo.set_active_text (pop_strings.front());
-       pop_strings = internationalize((const char **) sndfile_bitdepth_formats_strings);
-       Gtkmm2ext::set_popdown_strings (bitdepth_format_combo, pop_strings);
-       bitdepth_format_combo.set_active_text (pop_strings.front());
-       pop_strings = internationalize((const char **) sndfile_endian_formats_strings);
-       Gtkmm2ext::set_popdown_strings (endian_format_combo, pop_strings);
-       endian_format_combo.set_active_text (pop_strings.front());
-       pop_strings = internationalize(cue_file_types);
-       Gtkmm2ext::set_popdown_strings (cue_file_combo, pop_strings);
-       cue_file_combo.set_active_text (pop_strings.front());
-
-       /* 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 */
-
-       maxlen = 0;
-       const char *longest = X_("gl"); /* translators: one ascender, one descender */
-       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];
-               }
-       }
+       SessionHandlePtr::set_session (s);
 
-       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];
-               }
+       if (!_session) {
+               return;
        }
 
-       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];
-               }
-       }
+       /* Init handler and profile manager */
 
-       longest_str = longest;
+       handler = _session->get_export_handler ();
+       status = _session->get_export_status ();
 
-       /* force ascender + descender */
+       profile_manager.reset (new ExportProfileManager (*_session, type));
 
-       longest_str[0] = 'g';
-       longest_str[1] = 'l';
+       /* Possibly init stuff in derived classes */
 
-       //Gtkmm2ext::set_size_request_to_display_given_text (header_format_combo, longest_str.c_str(), 5+FUDGE, 5);
+       init ();
 
-       // TRANSLATORS: "slereg" is "stereo" with ascender and descender substituted
-       //Gtkmm2ext::set_size_request_to_display_given_text (channel_count_combo, _("slereg"), 5+FUDGE, 5);
+       /* Rest of _session related initialization */
 
-/*     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 (false);
-       format_table.set_border_width (5);
-       format_table.set_col_spacings (5);
-       format_table.set_row_spacings (5);
-
-       format_table.attach (channel_count_label, 0, 1, 0, 1);
-       format_table.attach (channel_count_combo, 1, 2, 0, 1);
-       
-       format_table.attach (header_format_label, 0, 1, 1, 2);
-       format_table.attach (header_format_combo, 1, 2, 1, 2);
-
-       format_table.attach (bitdepth_format_label, 0, 1, 2, 3);
-       format_table.attach (bitdepth_format_combo, 1, 2, 2, 3);
-
-       format_table.attach (endian_format_label, 0, 1, 3, 4);
-       format_table.attach (endian_format_combo, 1, 2, 3, 4);
-
-       format_table.attach (sample_rate_label, 0, 1, 4, 5);
-       format_table.attach (sample_rate_combo, 1, 2, 4, 5);
-
-       format_table.attach (src_quality_label, 0, 1, 5, 6);
-       format_table.attach (src_quality_combo, 1, 2, 5, 6);
-
-       format_table.attach (dither_type_label, 0, 1, 6, 7);
-       format_table.attach (dither_type_combo, 1, 2, 6, 7);
-
-       format_table.attach (cue_file_label, 0, 1, 7, 8);
-       format_table.attach (cue_file_combo, 1, 2, 7, 8);
-       format_table.attach (cuefile_only_checkbox, 0, 2, 8, 9);
-
-       file_entry.set_name ("ExportFileDisplay");
-
-       signal_delete_event().connect (mem_fun(*this, &ExportDialog::window_closed));
-
-       cancel_button = add_button (Stock::CANCEL, RESPONSE_CANCEL);
-       cancel_button->signal_clicked().connect (mem_fun(*this, &ExportDialog::end_dialog));
-       ok_button = add_button (_("Export"), RESPONSE_ACCEPT);
-       ok_button->signal_clicked().connect (mem_fun(*this, &ExportDialog::do_export));
-       
-       file_browse_button.set_name ("EditorGTKButton");
-       file_browse_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::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));
-}
+       preset_selector->set_manager (profile_manager);
+       file_notebook->set_session_and_manager (_session, profile_manager);
 
-ExportDialog::~ExportDialog()
-{
-}
+       /* Hand on selection range to profile manager  */
 
-void
-ExportDialog::do_not_allow_track_and_master_selection()
-{
-       track_and_master_selection_allowed = false;
-       track_vpacker.set_no_show_all();
-}
+       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 ();
+       }
 
-void
-ExportDialog::do_not_allow_channel_count_selection()
-{
-       channel_count_selection_allowed = false;
-       channel_count_combo.set_no_show_all();
-       channel_count_label.set_no_show_all();
-}
+       /* Load states */
 
-void
-ExportDialog::do_not_allow_export_cd_markers()
-{
-       export_cd_markers_allowed = false;
-       cue_file_label.set_no_show_all();
-       cue_file_combo.set_no_show_all();
-       cuefile_only_checkbox.set_no_show_all();
-}
+       profile_manager->load_profile ();
+       sync_with_manager ();
 
-void
-ExportDialog::connect_to_session (Session *s)
-{
-       session = s;
-       session->GoingAway.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;
-       }
+       /* Warnings */
 
-       src_quality_combo.set_sensitive (false);
+       preset_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::sync_with_manager));
+       timespan_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings_and_example_filename));
+       channel_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings_and_example_filename));
+       file_notebook->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::update_warnings_and_example_filename));
 
-       set_state();
+       update_warnings_and_example_filename ();
 }
 
 void
-ExportDialog::set_state()
+ExportDialog::init ()
 {
-       XMLNode* node = session->instant_xml(X_("ExportDialog"), session->path());
-       XMLProperty* prop;
+       init_components ();
+       init_gui ();
 
-       if (node) {
+       /* warnings */
 
-               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());
-               }
-       }
+       warning_widget.pack_start (warn_hbox, true, true, 6);
+       warning_widget.pack_end (list_files_hbox, false, false, 0);
 
-       header_chosen ();
-       bitdepth_chosen();
-       channels_chosen();
-       sample_rate_chosen();
+       warn_hbox.pack_start (warn_label, true, true, 16);
+       warn_label.set_use_markup (true);
 
-       if (session->master_out()) {
-               track_scroll.hide ();
-       } else {
-               master_scroll.hide ();
-               track_selector_button.hide ();
-       }
+       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);
 
-       if (!node) {
-               return;
-       }
+       list_files_button.signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::show_conflicting_files));
 
-       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;
-                               }
-                       }
+       /* Progress indicators */
 
-               } else {
-                       /* XXX use XML state */
-               }
-       }
+       progress_widget.pack_start (progress_bar, false, false, 6);
 
-       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;
-               }
+       /* Buttons */
 
-               XMLNode* track = *it;
-               row = *ri;
+       cancel_button = add_button (Gtk::Stock::CANCEL, RESPONSE_CANCEL);
+       export_button = add_button (_("Export"), RESPONSE_FAST);
+       set_default_response (RESPONSE_FAST);
 
-               if ((prop = track->property(X_("channel1"))) != 0) {
-                       if (prop->value() == X_("on")) {
-                               row[exp_cols.left] = true;
-                       } else {
-                               row[exp_cols.left] = false;
-                       }
-               }
+       list_files_button.set_name ("PaddedButton");
 
-               if ((prop = track->property(X_("channel2"))) != 0) {
-                       if (prop->value() == X_("on")) {
-                               row[exp_cols.right] = true;
-                       } else {
-                               row[exp_cols.right] = false;
-                       }
-               }
-       }
-}
+       cancel_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::close_dialog));
+       export_button->signal_clicked().connect (sigc::mem_fun (*this, &ExportDialog::do_export));
 
-void
-ExportDialog::save_state()
-{
-       if (!session) {
-               return;
-       }
+       /* Done! */
 
-       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"));
-
-               tracks->add_child_nocopy(*track);
-       }
-       node->add_child_nocopy(*tracks);
-       
-       session->add_instant_xml(*node, session->path());
+       show_all_children ();
+       progress_widget.hide_all();
 }
 
 void
-ExportDialog::set_range (nframes_t start, nframes_t end)
+ExportDialog::expanded_changed ()
 {
-       spec.start_frame = start;
-       spec.end_frame = end;
+       set_resizable(advanced->get_expanded());
 }
 
-gint
-ExportDialog::progress_timeout ()
+void
+ExportDialog::init_gui ()
 {
-       progress_bar.set_fraction (spec.progress);
-       return TRUE;
+       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::VPaned * advanced_paned = Gtk::manage (new Gtk::VPaned());
+
+       Gtk::VBox* timespan_vbox = Gtk::manage (new Gtk::VBox());
+       timespan_vbox->set_spacing (12);
+       timespan_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, 0, 18, 0);
+       timespan_vbox->pack_start (*timespan_label, false, false, 0);
+       timespan_vbox->pack_start (*timespan_align, true, true, 0);
+       advanced_paned->pack1(*timespan_vbox, true, false);
+
+       Gtk::VBox* channels_vbox = Gtk::manage (new Gtk::VBox());
+       channels_vbox->set_spacing (12);
+       channels_vbox->set_border_width (12);
+
+       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);
+       channels_vbox->pack_start (*channels_label, false, false, 0);
+       channels_vbox->pack_start (*channels_align, true, true, 0);
+       advanced_paned->pack2(*channels_vbox, channel_selector_is_expandable(), false);
+
+       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);
+
+       advanced = Gtk::manage (new Gtk::Expander (_("Time span and channel options")));
+       advanced->property_expanded().signal_changed().connect(
+               sigc::mem_fun(*this, &ExportDialog::expanded_changed));
+       advanced->add (*advanced_paned);
+
+       if (channel_selector_is_expandable()) {
+               advanced_sizegroup = Gtk::SizeGroup::create(Gtk::SIZE_GROUP_VERTICAL);
+               advanced_sizegroup->add_widget(*timespan_selector);
+               advanced_sizegroup->add_widget(*channel_selector);
+       }
+
+       get_vbox()->pack_start (*advanced, true, true);
+
+       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
-frames_to_cd_frames_string (char* buf, nframes_t when, nframes_t fr)
+ExportDialog::init_components ()
 {
-
-  long unsigned int remainder;
-  int mins, secs, frames;
-
-       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);
-
+       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 ());
 }
 
-struct LocationSortByStart {
-    bool operator() (Location *a, Location *b) {
-           return a->start() < b->start();
-    }
-};
-
 void
-ExportDialog::export_toc_file (Locations::LocationList& locations, const string& path)
+ExportDialog::notify_errors (bool force)
 {
-       if(!export_cd_markers_allowed){
-               return;
-       }
-       
-    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;
-       }
-       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 ++;
-           }
-         }
-       }
-
-       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 (force || status->errors()) {
+               std::string 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::export_cue_file (Locations::LocationList& locations, const string& path)
+ExportDialog::close_dialog ()
 {
-       if(!export_cd_markers_allowed){
-               return;
-       }
-       
-    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;
-       }
-
-       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++;
-                       }
-               }
-       }
-       
-       out << "REM Cue file generated by Ardour" << endl;
-       out << "TITLE \"" << session->name() << "\"" << endl;
-
-       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 (status->running) {
+               status->abort();
        }
 
-       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;
-       }
+       hide_all ();
+       set_modal (false);
 
-       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++;
-                   }
-               }
-       }
-       
-}
-       
-void
-ExportDialog::do_export_cd_markers (const string& path,const string& cuefile_type)
-{
-       if (cuefile_type == "TOC") {
-               session->locations()->apply (*this, &ExportDialog::export_toc_file, path);      
-       } else {
-               session->locations()->apply (*this, &ExportDialog::export_cue_file, path);
-       }
 }
 
-
 void
-ExportDialog::do_export ()
+ExportDialog::sync_with_manager ()
 {
-       string filepath = file_entry.get_text();
-       
-       if(!is_filepath_valid(filepath)){
-               return;
-       }
-
-       if (export_cd_markers_allowed) {
-               if (cue_file_combo.get_active_text () != _("None")) {
-                       do_export_cd_markers (file_entry.get_text(), cue_file_combo.get_active_text ());
-               }
+       timespan_selector->sync_with_manager();
+       channel_selector->sync_with_manager();
+       file_notebook->sync_with_manager ();
 
-               if (cuefile_only_checkbox.get_active()) {
-                       end_dialog ();
-                       return;
-               }
-       }
-
-       ok_button->set_sensitive(false);
-       save_state();
-
-       set_modal (true);
-       
-       // read user input into spec
-       initSpec(filepath);
-       
-       progress_connection = Glib::signal_timeout().connect (mem_fun(*this, &ExportDialog::progress_timeout), 100);
-       cancel_label.set_text (_("Stop Export"));
-
-       export_audio_data();
-       
-       progress_connection.disconnect ();
-       end_dialog ();
+       update_warnings_and_example_filename ();
 }
-       
 
 void
-ExportDialog::end_dialog ()
+ExportDialog::update_warnings_and_example_filename ()
 {
+       /* Reset state */
 
-       if (spec.running) {
-               spec.stop = true;
+       warn_string = "";
+       warn_label.set_markup (warn_string);
 
-               while (spec.running) {
-                       if (gtk_events_pending()) {
-                               gtk_main_iteration ();
-                       } else {
-                               usleep (10000);
-                       }
-               }
-       }
+       list_files_hbox.hide ();
+       list_files_string = "";
 
-       session->engine().freewheel (false);
+       export_button->set_sensitive (true);
 
-       hide_all ();
+       /* Add new warnings */
 
-       set_modal (false);
-       ok_button->set_sensitive(true);
-}
+       boost::shared_ptr<ExportProfileManager::Warnings> warnings = profile_manager->get_warnings();
 
-void
-ExportDialog::start_export ()
-{
-       if (session == 0) {
-               return;
+       for (std::list<string>::iterator it = warnings->errors.begin(); it != warnings->errors.end(); ++it) {
+               add_error (*it);
        }
 
-       /* If 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);
-               }
+       for (std::list<string>::iterator it = warnings->warnings.begin(); it != warnings->warnings.end(); ++it) {
+               add_warning (*it);
+       }
 
-               dir = dir + "export.wav";
-               
-               file_entry.set_text (dir);
+       if (!warnings->conflicting_filenames.empty()) {
+               list_files_hbox.show ();
+               for (std::list<string>::iterator it = warnings->conflicting_filenames.begin(); it != warnings->conflicting_filenames.end(); ++it) {
+                       string::size_type pos = it->find_last_of ("/");
+                       list_files_string += it->substr (0, pos + 1) + "<b>" + it->substr (pos + 1) + "</b>\n";
+               }
        }
-       
-       progress_bar.set_fraction (0);
-       cancel_label.set_text (_("Cancel"));
 
-       show_all ();
+       /* Update example filename */
 
-       if (session->master_out()) {
-               track_scroll.hide ();
-       } else {
-               master_scroll.hide ();
-               track_selector_button.hide ();
-       }
+       file_notebook->update_example_filenames();
 }
 
 void
-ExportDialog::header_chosen ()
+ExportDialog::show_conflicting_files ()
 {
-       if (sndfile_header_format_from_string (header_format_combo.get_active_text ()) == SF_FORMAT_WAV) {
-               endian_format_combo.set_sensitive (false);
-       } else {
-               endian_format_combo.set_sensitive (true);
-       }
-}
+       ArdourDialog dialog (_("Files that will be overwritten"), true);
 
-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;
-
-       default:
-               dither_type_combo.set_sensitive (true);
-               break;
-       }
-}
+       Gtk::Label label ("", Gtk::ALIGN_LEFT);
+       label.set_use_markup (true);
+       label.set_markup (list_files_string);
 
-void
-ExportDialog::cue_file_type_chosen ()
-{
-       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);
-       }
+       dialog.get_vbox()->pack_start (label);
+       dialog.add_button (Gtk::Stock::OK, 0);
+       dialog.show_all_children ();
+
+       dialog.run();
 }
 
 void
-ExportDialog::sample_rate_chosen ()
+ExportDialog::do_export ()
 {
-       string sr_str = sample_rate_combo.get_active_text();
-       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);
+       try {
+               profile_manager->prepare_for_export ();
+               handler->do_export ();
+               show_progress ();
+       } catch(std::exception & e) {
+               error << string_compose (_("Export initialization failed: %1"), e.what()) << endmsg;
+               notify_errors(true);
        }
 }
 
 void
-ExportDialog::channels_chosen ()
+ExportDialog::show_progress ()
 {
-       bool mono;
-
-       mono = (channel_count_combo.get_active_text() == _("mono"));
+       status->running = true;
 
-       if (mono) {
-               track_selector.get_column(2)->set_visible(false);
-               track_selector.get_column(1)->set_title(_("Export"));
+       cancel_button->set_label (_("Stop Export"));
+       export_button->set_sensitive (false);
 
-               if (session->master_out()) {
-                       master_selector.get_column(2)->set_visible(false);
-                       master_selector.get_column(1)->set_title(_("Export"));
-               }
+       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);
 
-       } else {
-               track_selector.get_column(2)->set_visible(true);
-               track_selector.get_column(1)->set_title(_("Left"));
+       gtk_main_iteration ();
 
-               if (session->master_out()) {
-                       master_selector.get_column(2)->set_visible(true);
-                       master_selector.get_column(1)->set_title(_("Left"));
+       while (status->running) {
+               if (gtk_events_pending()) {
+                       gtk_main_iteration ();
+               } else {
+                       Glib::usleep (10000);
                }
        }
 
-       fill_lists();
-}
+       if (!status->aborted()) {
 
-void
-ExportDialog::fill_lists ()
-{
-       track_list->clear();
-       master_list->clear();
-       
-       boost::shared_ptr<Session::RouteList> routes = session->get_routes ();
-
-       for (Session::RouteList::iterator ri = routes->begin(); ri != routes->end(); ++ri) {
-               
-               boost::shared_ptr<Route> route = (*ri);
+               NagScreen* ns = NagScreen::maybe_nag (_("export"));
                
-               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);
-                       }
+               if (ns) {
+                       ns->nag ();
+                       delete ns;
                }
+       } else {
+               notify_errors ();
        }
-}
 
+       status->finish ();
+}
 
-bool
-ExportDialog::is_filepath_valid(string &filepath)
+gint
+ExportDialog::progress_timeout ()
 {
-       // sanity check file name first
+       std::string status_text;
+       float progress = 0.0;
+       if (status->normalizing) {
+               status_text = string_compose (_("Normalizing '%3' (timespan %1 of %2)"),
+                                             status->timespan, status->total_timespans, status->timespan_name);
+               progress = ((float) status->current_normalize_cycle) / status->total_normalize_cycles;
+       } else {
+               status_text = string_compose (_("Exporting '%3' (timespan %1 of %2)"),
+                                             status->timespan, status->total_timespans, status->timespan_name);
+               progress = ((float) status->processed_frames_current_timespan) / status->total_frames_current_timespan;
+       }
+       progress_bar.set_text (status_text);
 
-       struct stat statbuf;
-  
-       if (filepath.empty()) {
-               string txt = _("Please enter a valid filename.");
-               MessageDialog msg (*this, txt, false, MESSAGE_ERROR, BUTTONS_OK, true);
-               msg.run();
-               return false;
-       }
-       
-       // check if file exists already and warn
-
-       if (stat (filepath.c_str(), &statbuf) == 0) {
-               if (S_ISDIR (statbuf.st_mode)) {
-                       string txt = _("Please specify a complete filename for the audio file.");
-                       MessageDialog msg (*this, txt, false, MESSAGE_ERROR, BUTTONS_OK, true);
-                       msg.run();
-                       return false;
-               }
-               else {
-                       string txt = _("File already exists, do you want to overwrite it?");
-                       MessageDialog msg (*this, txt, false, MESSAGE_QUESTION, BUTTONS_YES_NO, true);
-                       if ((ResponseType) msg.run() == Gtk::RESPONSE_NO) {
-                               return false;
-                       }
-               }
-       }
-       
-       // directory needs to exist and be writable
-
-       string dirpath = Glib::path_get_dirname (filepath);
-       if (::access (dirpath.c_str(), W_OK) != 0) {
-               string txt = _("Cannot write file in: ") + dirpath;
-               MessageDialog msg (*this, txt, false, MESSAGE_ERROR, BUTTONS_OK, true);
-               msg.run();
-               return false;
-       }
-       
-       return true;
+       if (progress < previous_progress) {
+               // Work around gtk bug
+               progress_bar.hide();
+               progress_bar.show();
+       }
+       previous_progress = progress;
+
+       progress_bar.set_fraction (progress);
+       return TRUE;
 }
 
 void
-ExportDialog::initSpec(string &filepath)
+ExportDialog::add_error (string const & text)
 {
-       spec.path = filepath;
-       spec.progress = 0;
-       spec.running = true;
-       spec.stop = false;
-       spec.port_map.clear();
-       
-       if (channel_count_combo.get_active_text() == _("mono")) {
-               spec.channels = 1;
+       export_button->set_sensitive (false);
+
+       if (warn_string.empty()) {
+               warn_string = _("<span color=\"#ffa755\">Error: ") + text + "</span>";
        } else {
-               spec.channels = 2;
+               warn_string = _("<span color=\"#ffa755\">Error: ") + text + "</span>\n" + warn_string;
        }
 
-       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 ());
-       }
+       warn_label.set_markup (warn_string);
+}
 
-       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;
+void
+ExportDialog::add_warning (string const & text)
+{
+       if (warn_string.empty()) {
+               warn_string = _("<span color=\"#ffa755\">Warning: ") + text + "</span>";
        } else {
-               spec.src_quality = SRC_SINC_BEST_QUALITY;
+               warn_string = warn_string + _("\n<span color=\"#ffa755\">Warning: ") + text + "</span>";
        }
 
-       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;
-       } 
-
-       write_track_and_master_selection_to_spec();
+       warn_label.set_markup (warn_string);
 }
 
+/*** Dialog specializations ***/
+
+ExportRangeDialog::ExportRangeDialog (PublicEditor & editor, string range_id) :
+  ExportDialog (editor, _("Export Range"), ExportProfileManager::RangeExport),
+  range_id (range_id)
+{}
 
 void
-ExportDialog::write_track_and_master_selection_to_spec()
+ExportRangeDialog::init_components ()
 {
-       if(!track_and_master_selection_allowed){
-               return;
-       }
+       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 ());
+}
 
-       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));
-                       }
-               }
-       }
-       
-       chan = 0;
-       rows = track_selector.get_model()->children();
+ExportSelectionDialog::ExportSelectionDialog (PublicEditor & editor) :
+  ExportDialog (editor, _("Export Selection"), ExportProfileManager::SelectionExport)
+{}
 
-       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;
-       }
+void
+ExportSelectionDialog::init_components ()
+{
+       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 ());
 }
 
+ExportRegionDialog::ExportRegionDialog (PublicEditor & editor, ARDOUR::AudioRegion const & region, ARDOUR::AudioTrack & track) :
+  ExportDialog (editor, _("Export Region"), ExportProfileManager::RegionExport),
+  region (region),
+  track (track)
+{}
 
-gint
-ExportDialog::window_closed (GdkEventAny *ignored)
+void
+ExportRegionDialog::init_gui ()
 {
-       end_dialog ();
-       return TRUE;
+       ExportDialog::init_gui ();
+
+       channels_label->set_text (_("Source"));
 }
 
 void
-ExportDialog::browse ()
+ExportRegionDialog::init_components ()
 {
-       FileChooserDialog dialog("Export to file", FILE_CHOOSER_ACTION_SAVE);
-       dialog.set_transient_for(*this);
-       dialog.set_filename (file_entry.get_text());
-
-       dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-       dialog.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
-  
-       int result = dialog.run();
-
-       if (result == Gtk::RESPONSE_OK) {
-               string filename = dialog.get_filename();
-       
-               if (filename.length()) {
-                       file_entry.set_text (filename);
-               }
-       }
+       string loc_id = profile_manager->set_single_range (region.position(), region.position() + region.length(), region.name());
+
+       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 ());
+}
+
+StemExportDialog::StemExportDialog (PublicEditor & editor)
+  : ExportDialog(editor, _("Stem Export"), ExportProfileManager::StemExport)
+{
+
 }
 
 void
-ExportDialog::track_selector_button_click ()
+StemExportDialog::init_components ()
 {
-       if (track_scroll.is_visible ()) {
-               track_scroll.hide ();
-       } else {
-               track_scroll.show_all ();
-       }
+       preset_selector.reset (new ExportPresetSelector ());
+       timespan_selector.reset (new ExportTimespanSelectorMultiple (_session, profile_manager));
+       channel_selector.reset (new TrackExportChannelSelector (_session, profile_manager));
+       file_notebook.reset (new ExportFileNotebook ());
 }