X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_dialog.cc;h=ef99bf43bf8059330c507686e5c70ac5c3274c9b;hb=d8ade6d30595a3a8be343b392e47d422940eac27;hp=27bc80a6bdad259fb6b9331271eee324ee71ec9f;hpb=2e8f80e37a7d20deb3f138cd72c26f8c6de9d1ab;p=ardour.git

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 27bc80a6bd..ef99bf43bf 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -24,7 +24,6 @@
 #include <fstream>
 
 #include <samplerate.h>
-
 #include <pbd/convert.h>
 #include <pbd/xml++.h>
 
@@ -32,12 +31,14 @@
 #include <gtkmm2ext/window_title.h>
 
 #include <ardour/export.h>
+#include <ardour/session_directory.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/profile.h>
 
 #include "export_dialog.h"
 #include "ardour_ui.h"
@@ -55,8 +56,6 @@ using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 
-using PBD::internationalize;
-
 static const gchar *sample_rates[] = {
 	N_("22.05kHz"),
 	N_("44.1kHz"),
@@ -130,7 +129,7 @@ ExportDialog::ExportDialog(PublicEditor& e)
 	set_wmclass (X_("ardour_export"), "Ardour");
 	set_name ("ExportWindow");
 	add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
-
+	
 	spec.running = false;
 
 	file_entry.set_name ("ExportFileNameEntry");
@@ -144,7 +143,7 @@ ExportDialog::ExportDialog(PublicEditor& e)
 	master_selector.append_column_editable(_("Left"), exp_cols.left);
 	master_selector.append_column_editable(_("Right"), exp_cols.right);
 	master_selector.get_column(0)->set_min_width(100);
-	
+
 	master_selector.get_column(1)->set_min_width(40);
 	master_selector.get_column(1)->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE);
 	master_selector.get_column(2)->set_min_width(40);
@@ -216,28 +215,28 @@ ExportDialog::ExportDialog(PublicEditor& e)
 	   takes a reference. 
 	*/
 
-	vector<string> pop_strings = I18N(sample_rates);
+	vector<string> pop_strings = I18N (sample_rates);
 	Gtkmm2ext::set_popdown_strings (sample_rate_combo, pop_strings);
 	sample_rate_combo.set_active_text (pop_strings.front());
-	pop_strings = I18N(src_quality);
+	pop_strings = I18N (src_quality);
 	Gtkmm2ext::set_popdown_strings (src_quality_combo, pop_strings);
 	src_quality_combo.set_active_text (pop_strings.front());
-	pop_strings = I18N(dither_types);
+	pop_strings = I18N (dither_types);
 	Gtkmm2ext::set_popdown_strings (dither_type_combo, pop_strings);
 	dither_type_combo.set_active_text (pop_strings.front());
-	pop_strings = I18N(channel_strings);
+	pop_strings = I18N (channel_strings);
 	Gtkmm2ext::set_popdown_strings (channel_count_combo, pop_strings);
 	channel_count_combo.set_active_text (pop_strings.front());
-	pop_strings = I18N((const char **) sndfile_header_formats_strings);
+	pop_strings = I18N ((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 = I18N((const char **) sndfile_bitdepth_formats_strings);
+	pop_strings = I18N ((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 = I18N((const char **) sndfile_endian_formats_strings);
+	pop_strings = I18N ((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 = I18N(cue_file_types);
+	pop_strings = I18N (cue_file_types);
 	Gtkmm2ext::set_popdown_strings (cue_file_combo, pop_strings);
 	cue_file_combo.set_active_text (pop_strings.front());
 
@@ -320,30 +319,52 @@ ExportDialog::ExportDialog(PublicEditor& e)
 	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);
+	int row = 0;
+
+	format_table.attach (channel_count_label, 0, 1, row, row+1);
+	format_table.attach (channel_count_combo, 1, 2, row, row+1);
+
+	row++;
 	
-	format_table.attach (header_format_label, 0, 1, 1, 2);
-	format_table.attach (header_format_combo, 1, 2, 1, 2);
+	format_table.attach (header_format_label, 0, 1, row, row+1);
+	format_table.attach (header_format_combo, 1, 2, row, row+1);
+
+	row++;
+
+	format_table.attach (bitdepth_format_label, 0, 1, row, row+1);
+	format_table.attach (bitdepth_format_combo, 1, 2, row, row+1);
 
-	format_table.attach (bitdepth_format_label, 0, 1, 2, 3);
-	format_table.attach (bitdepth_format_combo, 1, 2, 2, 3);
+	row++;
 
-	format_table.attach (endian_format_label, 0, 1, 3, 4);
-	format_table.attach (endian_format_combo, 1, 2, 3, 4);
+	if (!Profile->get_sae()) {
+		format_table.attach (endian_format_label, 0, 1, row, row+1);
+		format_table.attach (endian_format_combo, 1, 2, row, row+1);
+		row++;
+	}
+
+	format_table.attach (sample_rate_label, 0, 1, row, row+1);
+	format_table.attach (sample_rate_combo, 1, 2, row, row+1);
 
-	format_table.attach (sample_rate_label, 0, 1, 4, 5);
-	format_table.attach (sample_rate_combo, 1, 2, 4, 5);
+	row++;
 
-	format_table.attach (src_quality_label, 0, 1, 5, 6);
-	format_table.attach (src_quality_combo, 1, 2, 5, 6);
+	if (!Profile->get_sae()) {
+		format_table.attach (src_quality_label, 0, 1, row, row+1);
+		format_table.attach (src_quality_combo, 1, 2, row, row+1);
+		row++;
+	}
 
-	format_table.attach (dither_type_label, 0, 1, 6, 7);
-	format_table.attach (dither_type_combo, 1, 2, 6, 7);
+	format_table.attach (dither_type_label, 0, 1, row, row+1);
+	format_table.attach (dither_type_combo, 1, 2, row, row+1);
 
-	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);
+	row++;
+
+	if (!Profile->get_sae()) {
+		format_table.attach (cue_file_label, 0, 1, row, row+1);
+		format_table.attach (cue_file_combo, 1, 2, row, row+1);
+		row++;
+	
+		format_table.attach (cuefile_only_checkbox, 0, 2, row, row+1);
+	}
 
 	file_entry.set_name ("ExportFileDisplay");
 
@@ -430,7 +451,7 @@ ExportDialog::connect_to_session (Session *s)
 void
 ExportDialog::set_state()
 {
-	XMLNode* node = session->instant_xml(X_("ExportDialog"), session->path());
+	XMLNode* node = session->instant_xml(X_("ExportDialog"));
 	XMLProperty* prop;
 
 	if (node) {
@@ -494,7 +515,7 @@ ExportDialog::set_state()
 			}
 
 			TreeModel::Children rows = master_selector.get_model()->children();
-			for (uint32_t r = 0; r < session->master_out()->n_outputs().get(DataType::AUDIO); ++r) {
+			for (uint32_t r = 0; r < session->master_out()->n_outputs().n_total(); ++r) {
 				if (nchns == 2) {
 					if (r % 2) {
 						rows[r][exp_cols.right] = true;
@@ -581,7 +602,7 @@ ExportDialog::save_state()
 	}
 	node->add_child_nocopy(*tracks);
 	
-	session->add_instant_xml(*node, session->path());
+	session->add_instant_xml(*node);
 }
 
 void
@@ -627,10 +648,9 @@ ExportDialog::export_toc_file (Locations::LocationList& locations, const string&
 		return;
 	}
 	
-    string filepath = path + ".toc";
+	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) {
@@ -645,102 +665,110 @@ ExportDialog::export_toc_file (Locations::LocationList& locations, const string&
 	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 ((*i)->start() >= spec.start_frame && (*i)->end() <= spec.end_frame && (*i)->is_cd_marker() && !(*i)->is_end()) {
+			temp.push_back (*i);
+		}
 	}
 
-	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()) {
+	if (temp.size() > 0) {
 		LocationSortByStart cmp;
 		temp.sort (cmp);
+		Location * curr_range = 0;
+		Locations::LocationList::iterator nexti;
 
 		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;
-			}
+			if ((*i)->start() >= last_end_time)
+			{
+				/* this is a track, defined by a cd range marker or a cd location marker outside of a cd range */
+				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;
+				
+				if ((*i)->is_mark()) {
+					// a mark track location needs to look ahead to the next marker's start to determine length
+					nexti = i;
+					++nexti;
+					if (nexti != temp.end()) {
+						frames_to_cd_frames_string (buf, (*nexti)->start() - 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 = (*nexti)->start();
+					}
+					else {
+						// this was the last marker, use session end
+						frames_to_cd_frames_string (buf, spec.end_frame - 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 = spec.end_frame;
+					}
 
-			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;
+					curr_range = 0;
+				}
+				else {
+					// range
+					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();
+
+					curr_range = (*i);
+				}
+				
 			}
-
-			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;
+			else if ((*i)->is_mark()) 
+			{
+				/* 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;
 			}
-
-			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;
-		      }
 		}
 	}
 	
@@ -785,7 +813,7 @@ ExportDialog::export_cue_file (Locations::LocationList& locations, const string&
 		  out << "FILE " << path  << ' ' << (header_format_combo.get_active_text()) << endl;
 	}
 
-	if (numtracks == 0) {
+	if (false && numtracks == 0) {
 		    /* the user has supplied no track markers.
 		       the entire export is treated as one track. 
 		    */
@@ -816,58 +844,78 @@ ExportDialog::export_cue_file (Locations::LocationList& locations, const string&
 	if (temp.size()) {
 		LocationSortByStart cmp;
 		temp.sort (cmp);
+		Location * curr_range = 0;
+		Locations::LocationList::iterator nexti;
 
 		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++;
-		    }
+			if ((*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++;
+
+				if ((*i)->is_mark()) {
+					// need to find the next start to define the end
+					nexti = i;
+					++nexti;
+					if (nexti != temp.end()) {
+						last_track_end = (*nexti)->start();
+					}
+					else {
+						last_track_end = spec.end_frame;
+					}
+					curr_range = 0;
+				}
+				else {
+					last_track_end = (*i)->end();
+					curr_range = (*i);
+				}
+			} 
+	
+			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++;
+			}
 		}
 	}
 	
@@ -888,12 +936,24 @@ void
 ExportDialog::do_export ()
 {
 	string filepath = file_entry.get_text();
- 	
+
+	if (!ARDOUR_UI::instance()->the_engine().connected()) {
+		MessageDialog msg (*this, 
+				   _("Not connected to audioengine"),
+				   true,
+				   MESSAGE_ERROR,
+				   BUTTONS_OK);
+		msg.set_secondary_text (_("Ardour cannot export audio when disconnected"));
+		msg.present ();
+		msg.run ();
+		return;
+	}
+		
 	if(!is_filepath_valid(filepath)){
 		return;
 	}
 
-	if (export_cd_markers_allowed) {
+	if (!Profile->get_sae() && 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 ());
 		}
@@ -915,8 +975,9 @@ ExportDialog::do_export ()
 	progress_connection = Glib::signal_timeout().connect (mem_fun(*this, &ExportDialog::progress_timeout), 100);
 	cancel_label.set_text (_("Stop Export"));
 
-	export_audio_data();
-	
+	session->pre_export ();
+	export_data();
+
   	progress_connection.disconnect ();
 	end_dialog ();
 }
@@ -936,7 +997,7 @@ ExportDialog::end_dialog ()
 		}
 	}
 
-	session->finalize_audio_export ();
+	session->finalize_export ();
 
 	hide_all ();
 
@@ -957,18 +1018,14 @@ ExportDialog::start_export ()
 	*/
 	
 	if (file_entry.get_text().length() == 0) {
-		string dir = session->export_dir();
-		string::size_type last_slash;
-		
-		if ((last_slash = dir.find_last_of ('/')) != string::npos && last_slash != 0) {
-			dir = dir.substr (0, last_slash+1);
-		}
+
+		sys::path export_file_path = session->session_directory().export_path();
 
 		if (!wants_dir()) {
-			dir = dir + "export.wav";
+			export_file_path /= "export.wav";
 		}
 		
-		file_entry.set_text (dir);
+		file_entry.set_text (export_file_path.to_string());
 	}
 	
 	progress_bar.set_fraction (0);
@@ -1092,13 +1149,13 @@ ExportDialog::fill_lists ()
 		
 		boost::shared_ptr<Route> route = (*ri);
 		
-		if (route->hidden()) {
+		if (route->is_hidden()) {
 			continue;
 		}
 
-		for (uint32_t i=0; i < route->n_outputs().get(DataType::AUDIO); ++i) {
+		for (uint32_t i=0; i < route->n_outputs().n_total(); ++i) {
 			string name;
-			if (route->n_outputs().get(DataType::AUDIO) == 1) {
+			if (route->n_outputs().n_total() == 1) {
 				name = route->name();
 			} else {
 				name = string_compose("%1: out-%2", route->name(), i+1);
@@ -1174,7 +1231,7 @@ ExportDialog::initSpec(string &filepath)
 {
 	spec.path = filepath;
 	spec.progress = 0;
-	spec.running = true;
+	spec.running = false;
 	spec.stop = false;
 	spec.port_map.clear();
 	
@@ -1187,10 +1244,12 @@ ExportDialog::initSpec(string &filepath)
 	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 ());
+
+	if (!Profile->get_sae()) {
+		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 ());
@@ -1212,17 +1271,21 @@ ExportDialog::initSpec(string &filepath)
 		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 {
+	if (Profile->get_sae()) {
 		spec.src_quality = SRC_SINC_BEST_QUALITY;
+	} else {
+		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;
+		}
 	}
 
 	string dither_str = dither_type_combo.get_active_text();