X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_dialog.cc;h=ef99bf43bf8059330c507686e5c70ac5c3274c9b;hb=d8ade6d30595a3a8be343b392e47d422940eac27;hp=ac4afb0b16d9f0c6ceb3b76b3fa8bdb4fc803ccc;hpb=ce234f363e95c38fc92728e520bf5ba240a89aa7;p=ardour.git diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index ac4afb0b16..ef99bf43bf 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ @@ -25,18 +24,21 @@ #include #include - #include #include #include +#include + #include +#include #include #include #include #include #include #include +#include #include "export_dialog.h" #include "ardour_ui.h" @@ -52,8 +54,7 @@ using namespace ARDOUR; using namespace PBD; using namespace sigc; using namespace Gtk; - -using PBD::internationalize; +using namespace Gtkmm2ext; static const gchar *sample_rates[] = { N_("22.05kHz"), @@ -109,7 +110,6 @@ ExportDialog::ExportDialog(PublicEditor& e) 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 ...")) { @@ -121,12 +121,15 @@ ExportDialog::ExportDialog(PublicEditor& e) track_and_master_selection_allowed = true; channel_count_selection_allowed = true; export_cd_markers_allowed = true; + + WindowTitle title(Glib::get_application_name()); + title += _("Export"); - set_title (_("ardour: export")); - set_wmclass (_("ardour_export"), "Ardour"); + set_title (title.get_string()); + 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"); @@ -140,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); @@ -212,28 +215,28 @@ ExportDialog::ExportDialog(PublicEditor& e) takes a reference. */ - vector pop_strings = internationalize(sample_rates); + vector 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 = internationalize(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 = internationalize(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 = internationalize(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 = internationalize((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 = internationalize((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 = internationalize((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 = internationalize(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()); @@ -316,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, 2, 3); - format_table.attach (bitdepth_format_combo, 1, 2, 2, 3); + 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 (endian_format_label, 0, 1, 3, 4); - format_table.attach (endian_format_combo, 1, 2, 3, 4); + row++; - format_table.attach (sample_rate_label, 0, 1, 4, 5); - format_table.attach (sample_rate_combo, 1, 2, 4, 5); + 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); + + 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"); @@ -396,25 +421,25 @@ ExportDialog::connect_to_session (Session *s) switch (session->frame_rate()) { case 22050: - sample_rate_combo.set_active_text (N_("22.05kHz")); + sample_rate_combo.set_active_text (_("22.05kHz")); break; case 44100: - sample_rate_combo.set_active_text (N_("44.1kHz")); + sample_rate_combo.set_active_text (_("44.1kHz")); break; case 48000: - sample_rate_combo.set_active_text (N_("48kHz")); + sample_rate_combo.set_active_text (_("48kHz")); break; case 88200: - sample_rate_combo.set_active_text (N_("88.2kHz")); + sample_rate_combo.set_active_text (_("88.2kHz")); break; case 96000: - sample_rate_combo.set_active_text (N_("96kHz")); + sample_rate_combo.set_active_text (_("96kHz")); break; case 192000: - sample_rate_combo.set_active_text (N_("192kHz")); + sample_rate_combo.set_active_text (_("192kHz")); break; default: - sample_rate_combo.set_active_text (N_("44.1kHz")); + sample_rate_combo.set_active_text (_("44.1kHz")); break; } @@ -426,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) { @@ -490,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(); ++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; @@ -571,17 +596,17 @@ ExportDialog::save_state() 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")); + track->add_property(X_("channel2"), 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()); + session->add_instant_xml(*node); } void -ExportDialog::set_range (jack_nframes_t start, jack_nframes_t end) +ExportDialog::set_range (nframes_t start, nframes_t end) { spec.start_frame = start; spec.end_frame = end; @@ -595,7 +620,7 @@ ExportDialog::progress_timeout () } void -frames_to_cd_frames_string (char* buf, jack_nframes_t when, jack_nframes_t fr) +frames_to_cd_frames_string (char* buf, nframes_t when, nframes_t fr) { long unsigned int remainder; @@ -623,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) { @@ -641,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; + 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("string_composer") != (*i)->cd_info.end()) { - out << " COMPOSER \"" << (*i)->cd_info["string_composer"] << "\"" << 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; } - - 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; - } } } @@ -781,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. */ @@ -812,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++; + } } } @@ -872,7 +924,7 @@ ExportDialog::export_cue_file (Locations::LocationList& locations, const string& void ExportDialog::do_export_cd_markers (const string& path,const string& cuefile_type) { - if (cuefile_type == "TOC") { + if (cuefile_type == _("TOC")) { session->locations()->apply (*this, &ExportDialog::export_toc_file, path); } else { session->locations()->apply (*this, &ExportDialog::export_cue_file, path); @@ -884,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 ()); } @@ -911,17 +975,16 @@ 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 (); } - void ExportDialog::end_dialog () { - if (spec.running) { spec.stop = true; @@ -934,7 +997,7 @@ ExportDialog::end_dialog () } } - session->engine().freewheel (false); + session->finalize_export (); hide_all (); @@ -950,21 +1013,19 @@ ExportDialog::start_export () } /* If the filename hasn't been set before, use the - directory above the current session as a default + current session's export directory 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); - } - dir = dir + "export.wav"; + sys::path export_file_path = session->session_directory().export_path(); + + if (!wants_dir()) { + export_file_path /= "export.wav"; + } - file_entry.set_text (dir); + file_entry.set_text (export_file_path.to_string()); } progress_bar.set_fraction (0); @@ -1022,19 +1083,19 @@ void ExportDialog::sample_rate_chosen () { string sr_str = sample_rate_combo.get_active_text(); - jack_nframes_t rate; + nframes_t rate; if (sr_str == N_("22.05kHz")) { rate = 22050; - } else if (sr_str == N_("44.1kHz")) { + } else if (sr_str == _("44.1kHz")) { rate = 44100; - } else if (sr_str == N_("48kHz")) { + } else if (sr_str == _("48kHz")) { rate = 48000; - } else if (sr_str == N_("88.2kHz")) { + } else if (sr_str == _("88.2kHz")) { rate = 88200; - } else if (sr_str == N_("96kHz")) { + } else if (sr_str == _("96kHz")) { rate = 96000; - } else if (sr_str == N_("192kHz")) { + } else if (sr_str == _("192kHz")) { rate = 192000; } else { rate = session->frame_rate(); @@ -1088,13 +1149,13 @@ ExportDialog::fill_lists () boost::shared_ptr route = (*ri); - if (route->hidden()) { + if (route->is_hidden()) { continue; } - for (uint32_t i=0; i < route->n_outputs(); ++i) { + for (uint32_t i=0; i < route->n_outputs().n_total(); ++i) { string name; - if (route->n_outputs() == 1) { + if (route->n_outputs().n_total() == 1) { name = route->name(); } else { name = string_compose("%1: out-%2", route->name(), i+1); @@ -1170,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(); @@ -1183,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 ()); @@ -1194,31 +1257,35 @@ ExportDialog::initSpec(string &filepath) 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")) { + } else if (sr_str == _("44.1kHz")) { spec.sample_rate = 44100; - } else if (sr_str == N_("48kHz")) { + } else if (sr_str == _("48kHz")) { spec.sample_rate = 48000; - } else if (sr_str == N_("88.2kHz")) { + } else if (sr_str == _("88.2kHz")) { spec.sample_rate = 88200; - } else if (sr_str == N_("96kHz")) { + } else if (sr_str == _("96kHz")) { spec.sample_rate = 96000; - } else if (sr_str == N_("192kHz")) { + } else if (sr_str == _("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 { + 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(); @@ -1307,7 +1374,7 @@ ExportDialog::window_closed (GdkEventAny *ignored) void ExportDialog::browse () { - FileChooserDialog dialog("Export to file", FILE_CHOOSER_ACTION_SAVE); + FileChooserDialog dialog("Export to file", browse_action()); dialog.set_transient_for(*this); dialog.set_filename (file_entry.get_text());