X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_video_dialog.cc;h=df05eed8073f1d192a0ad91c279060f550b91a3c;hb=18efe8f446f45b541f19a2f99dd707f66fb72a3e;hp=e88f9c5effa4997131e40745ff422c176f17aaba;hpb=2ba2a50decb4b2f8b6b688dea495a2898124cc4f;p=ardour.git

diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index e88f9c5eff..df05eed807 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -51,7 +51,6 @@
 #include "ardour/session_metadata.h"
 #include "ardour/broadcast_info.h"
 
-#include "utils.h"
 #include "opts.h"
 #include "export_video_dialog.h"
 #include "utils_videotl.h"
@@ -561,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 ();
@@ -612,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()) {
@@ -700,7 +701,7 @@ ExportVideoDialog::encode_pass (int pass)
 		ffs["-an"] = "-y";
 		ffs["-passlogfile"] =  Glib::path_get_dirname (outfn) + G_DIR_SEPARATOR + "ffmpeg2pass";
 		ffs["-f"] = get_file_extension(invid).empty()?"mov":get_file_extension(invid);
-#ifdef _OS_WIN32
+#ifdef PLATFORM_WINDOWS
 		outfn = "NUL";
 #else
 		outfn = "/dev/null";
@@ -732,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;