Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

[ardour.git] / gtk2_ardour / transcode_ffmpeg.cc

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 9499c6c1841af878beff434c1933722f222e4355..aedd7d25ebc44cbaa8612203ccd7b99748bf9313 100644 (file)
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -32,6 +32,10 @@
 
 #include "i18n.h"
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 using namespace PBD;
 
 TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
@@ -67,18 +71,19 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
        }
 
        if (ffmpeg_exe.empty() || ffprobe_exe.empty()) {
-               warning << _(
+               warning << string_compose(
+                               _(
                                "No ffprobe or ffmpeg executables could be found on this system.\n"
                                "Video import and export is not possible until you install those tools.\n"
-                               "Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+                               "%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
                                "\n"
-                               "The tools are included with the Ardour releases from ardour.org "
+                               "The tools are included with the %1 releases from ardour.org "
                                "and also available with the video-server at http://x42.github.com/harvid/\n"
                                "\n"
                                "Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n"
                                "If you already have a suitable ffmpeg installation on your system, we recommend creating "
                                "symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
-                               ) << endmsg;
+                               ), PROGRAM_NAME) << endmsg;
                return;
        }
        ffexecok = true;
@@ -122,7 +127,7 @@ TranscodeFfmpeg::probe ()
         * SystemExec::Terminated is emitted and ffcmd set to NULL */
        int timeout = 300; // 1.5 sec
        while (ffcmd && --timeout > 0) {
-               usleep(5000);
+               Glib::usleep(5000);
        }
        if (timeout == 0 || ffoutput.empty()) {
                return false;
@@ -391,7 +396,7 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
 }
 
 bool
-TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t samplerate, unsigned int stream)
+TranscodeFfmpeg::extract_audio (std::string outfile, ARDOUR::framecnt_t /*samplerate*/, unsigned int stream)
 {
        if (!probeok) return false;
   if (stream >= m_audio.size()) return false;
@@ -503,7 +508,11 @@ TranscodeFfmpeg::cancel ()
 {
        if (!ffcmd || !ffcmd->is_running()) { return;}
        ffcmd->write_to_stdin("q");
+#ifdef WIN32
+       Sleep(1000);
+#else
        sleep (1);
+#endif
        if (ffcmd) {
          ffcmd->terminate();
        }