revert VU meter background to default gray-shade

[ardour.git] / gtk2_ardour / transcode_ffmpeg.cc

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index f14e472815d1bdb98765dc4b39485ff6d9a88262..9e4aa39fa01e5efdc5bdeb9dd0a7d186c2278be3 100644 (file)
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -67,18 +67,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;
@@ -261,10 +262,10 @@ TranscodeFfmpeg::probe ()
        return true;
 }
 
-FFSettings
+TranscodeFfmpeg::FFSettings
 TranscodeFfmpeg::default_encoder_settings ()
 {
-       FFSettings ffs;
+       TranscodeFfmpeg::FFSettings ffs;
        ffs.clear();
        ffs["-vcodec"] = "mpeg4";
        ffs["-acodec"] = "ac3";
@@ -273,10 +274,10 @@ TranscodeFfmpeg::default_encoder_settings ()
        return ffs;
 }
 
-FFSettings
+TranscodeFfmpeg::FFSettings
 TranscodeFfmpeg::default_meta_data ()
 {
-       FFSettings ffm;
+       TranscodeFfmpeg::FFSettings ffm;
        ffm.clear();
        ffm["comment"] = "Created with ardour";
        return ffm;
@@ -308,7 +309,7 @@ TranscodeFfmpeg::format_metadata (std::string key, std::string value)
 }
 
 bool
-TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf_v, FFSettings ffs, FFSettings meta, bool map)
+TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf_v, TranscodeFfmpeg::FFSettings ffs, TranscodeFfmpeg::FFSettings meta, bool map)
 {
 #define MAX_FFMPEG_ENCODER_ARGS (100)
        char **argp;
@@ -327,11 +328,11 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
        argp[a++] = strdup("-i");
        argp[a++] = strdup(inf_a.c_str());
 
-       for(FFSettings::const_iterator it = ffs.begin(); it != ffs.end(); ++it) {
+       for(TranscodeFfmpeg::FFSettings::const_iterator it = ffs.begin(); it != ffs.end(); ++it) {
                argp[a++] = strdup(it->first.c_str());
                argp[a++] = strdup(it->second.c_str());
        }
-       for(FFSettings::const_iterator it = meta.begin(); it != meta.end(); ++it) {
+       for(TranscodeFfmpeg::FFSettings::const_iterator it = meta.begin(); it != meta.end(); ++it) {
                argp[a++] = strdup("-metadata");
                argp[a++] = format_metadata(it->first.c_str(), it->second.c_str());
        }
@@ -471,7 +472,7 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh,
        argp[6] = (char*) calloc(10,sizeof(char)); snprintf(argp[6], 10, "%ix%i", width, height);
        argp[7] = strdup("-y");
        argp[8] = strdup("-vcodec");
-       argp[9] = strdup("mpeg4");
+       argp[9] = strdup("mjpeg");
        argp[10] = strdup("-an");
        argp[11] = strdup("-intra");
        argp[12] = strdup("-g");