fix jack transport return value

[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 67030cdad57c13bf8870469da78c75bff74be63e..df05eed8073f1d192a0ad91c279060f550b91a3c 100644 (file)
--- 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 ();
@@ -572,7 +572,7 @@ ExportVideoDialog::launch_export ()
                if (gtk_events_pending()) {
                        gtk_main_iteration ();
                } else {
-                       usleep (10000);
+                       Glib::usleep (10000);
                }
        }
        audio_progress_connection.disconnect();
@@ -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;