install single color theme file during waf install

[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 e5f189073724075d3044b5d46fcfe784692f2886..df05eed8073f1d192a0ad91c279060f550b91a3c 100644 (file)
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -560,6 +560,7 @@ ExportVideoDialog::launch_export ()
        insnd = fnp->get_path(fmp);
 
        /* do sound export */
+       fmp->set_soundcloud_upload(false);
        _session->get_export_handler()->add_export_config (tsp, ccp, fmp, fnp, b);
        _session->get_export_handler()->do_export();
        status = _session->get_export_status ();
@@ -611,7 +612,8 @@ ExportVideoDialog::encode_pass (int pass)
        ffs.clear();
 
        if (fps_checkbox.get_active()) {
-         ffs["-r"] = fps_combo.get_active_text();
+               ffs["-r"] = fps_combo.get_active_text();
+               transcoder->set_fps(atof(fps_combo.get_active_text()));
        }
 
        if (scale_checkbox.get_active()) {
@@ -731,11 +733,7 @@ ExportVideoDialog::encode_pass (int pass)
 
        std::ostringstream osstream; osstream << duration_s;
        ffs["-t"] = osstream.str();
-       if (fps_checkbox.get_active()) {
-               transcoder->set_duration(duration_s * atof(fps_combo.get_active_text()));
-       } else {
-               transcoder->set_duration(duration_s * transcoder->get_fps());
-       }
+       transcoder->set_duration(duration_s * transcoder->get_fps());
 
        if (insnd_combo.get_active_row_number() == 0 || insnd_combo.get_active_row_number() == 2) {
                framepos_t start, snend;