Don't invalidate AU preset on load

[ardour.git] / gtk2_ardour / export_video_dialog.cc

diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index eefd8def9076256243cfcaa59baac3d843c3dfc1..d5182bcc5fb4431f4b75eee82396e6d083105e67 100644 (file)
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -96,7 +96,7 @@ ExportVideoDialog::ExportVideoDialog ()
        , optimizations_checkbox (_("Codec Optimizations:"))
        , optimizations_label ("-")
        , deinterlace_checkbox (_("Deinterlace"))
-       , bframes_checkbox (_("Use [2] B-samples (MPEG 2 or 4 only)"))
+       , bframes_checkbox (_("Use [2] B-frames (MPEG 2 or 4 only)"))
        , fps_checkbox (_("Override FPS (Default is to retain FPS from the input video file):"))
        , meta_checkbox (_("Include Session Metadata"))
 #if 1 /* tentative debug mode */
@@ -154,7 +154,6 @@ ExportVideoDialog::ExportVideoDialog ()
        path_hbox->pack_start (*l, false, false, 2);
        vbox->pack_start (*path_hbox, false, false, 2);
 
-       insnd_combo.append_text (string_compose (_("from the %1 session's start to the session's end"), PROGRAM_NAME));
        outfn_path_entry.set_width_chars(38);
 
        l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
@@ -335,10 +334,15 @@ ExportVideoDialog::apply_state (TimeSelection &tme, bool range)
 
        // TODO remember setting for export-range.. somehow, (let explicit range override)
        sampleoffset_t av_offset = ARDOUR_UI::instance()->video_timeline->get_offset();
+
+       insnd_combo.remove_all ();
+
+       insnd_combo.append_text (_("from session start marker to session end marker"));
+
        if (av_offset < 0 ) {
-               insnd_combo.append_text (_("from 00:00:00:00 to the video's end"));
+               insnd_combo.append_text (_("from 00:00:00:00 to the video end"));
        } else {
-               insnd_combo.append_text (_("from the video's start to the video's end"));
+               insnd_combo.append_text (_("from video start to video end"));
        }
        if (!export_range.empty()) {
                insnd_combo.append_text (_("Selected range"));  // TODO show export_range.start() -> export_range.end_sample()
@@ -771,6 +775,7 @@ ExportVideoDialog::launch_export ()
 
        /* do sound export */
        fmp->set_soundcloud_upload(false);
+       _session->get_export_handler()->reset ();
        _session->get_export_handler()->add_export_config (tsp, ccp, fmp, fnp, b);
        _session->get_export_handler()->do_export();
        status = _session->get_export_status ();
@@ -999,30 +1004,11 @@ ExportVideoDialog::encode_pass (int pass)
                _transcoder->set_avoffset(av_offset / (double)_session->nominal_sample_rate());
        }
 
-       TranscodeFfmpeg::FFSettings meta = _transcoder->default_meta_data();
+       /* NOTE: type (MetaDataMap) == type (FFSettings) == map<string, string> */
+       ARDOUR::SessionMetadata::MetaDataMap meta = _transcoder->default_meta_data();
        if (meta_checkbox.get_active()) {
                ARDOUR::SessionMetadata * session_data = ARDOUR::SessionMetadata::Metadata();
-               if (session_data->year() > 0 ) {
-                       std::ostringstream osstream; osstream << session_data->year();
-                       meta["year"] = osstream.str();
-               }
-               if (session_data->track_number() > 0 ) {
-                       std::ostringstream osstream; osstream << session_data->track_number();
-                       meta["track"] = osstream.str();
-               }
-               if (session_data->disc_number() > 0 ) {
-                       std::ostringstream osstream; osstream << session_data->disc_number();
-                       meta["disc"] = osstream.str();
-               }
-               if (!session_data->title().empty())     {meta["title"] = session_data->title();}
-               if (!session_data->artist().empty())    {meta["author"] = session_data->artist();}
-               if (!session_data->album_artist().empty()) {meta["album_artist"] = session_data->album_artist();}
-               if (!session_data->album().empty())     {meta["album"] = session_data->album();}
-               if (!session_data->genre().empty())     {meta["genre"] = session_data->genre();}
-               if (!session_data->composer().empty())  {meta["composer"] = session_data->composer();}
-               if (!session_data->comment().empty())   {meta["comment"] = session_data->comment();}
-               if (!session_data->copyright().empty()) {meta["copyright"] = session_data->copyright();}
-               if (!session_data->subtitle().empty())  {meta["description"] = session_data->subtitle();}
+               session_data->av_export_tag (meta);
        }
 
 #if 1 /* tentative debug mode */