ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

clean up video related messages

Browse Source
This commit is contained in:
Robin Gareus 2013-07-23 20:24:23 +02:00
parent c4c70c347d
commit dd65329363
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/export_video_dialog.cc
View File

@ -85,7 +85,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
, fps_checkbox (_("Override FPS (Default is to retain FPS from the input video file):"))
, meta_checkbox (_("Include Session Metadata"))
#if 1 /* tentative debug mode */
, debug_checkbox (_("Enable Debug Mode: Print ffmpeg Command & Output to stdout."))
, debug_checkbox (_("Debug Mode: Print ffmpeg command and output to stdout."))
#endif
{
set_session (s);

9
gtk2_ardour/transcode_ffmpeg.cc
View File

@ -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;

2
gtk2_ardour/transcode_video_dialog.cc
View File

@ -66,7 +66,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
, bitrate_adjustment (2000, 500, 10000, 10, 100, 0)
, bitrate_spinner (bitrate_adjustment)
#if 1 /* tentative debug mode */
, debug_checkbox (_("Debug Mode: Print ffmpeg Command and Output to stdout."))
, debug_checkbox (_("Debug Mode: Print ffmpeg command and output to stdout."))
#endif
{
set_session (s);

10
gtk2_ardour/video_server_dialog.cc
View File

@ -87,8 +87,10 @@ VideoServerDialog::VideoServerDialog (Session* s)
}
else {
PBD::warning <<
_("The external video server 'harvid' can not be found. The tool is included with the Ardour releases from ardour.org, "
"alternatively you can download it from http://x42.github.com/harvid/ or acquire it from your distribution.") << endmsg;
string_compose(
_("The external video server 'harvid' can not be found. The tool is included with the %1 releases from ardour.org, "
"alternatively you can download it from http://x42.github.com/harvid/ or acquire it from your distribution."), PROGRAM_NAME)
<< endmsg;
}
@ -129,7 +131,9 @@ VideoServerDialog::VideoServerDialog (Session* s)
t->attach (*l, 0, 1, 2, 3, FILL);
t->attach (cachesize_spinner, 1, 2, 2, 3);
l = manage (new Label (_("Ardour relies on an external Video Server for the videotimeline.\nThe server configured in Edit -> Prefereces -> Video is not reachable.\nDo you want ardour to launch 'harvid' on this machine?"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l = manage (new Label (string_compose(
_("%1 relies on an external Video Server for the videotimeline.\nThe server configured in Edit -> Prefereces -> Video is not reachable.\nDo you want ardour to launch 'harvid' on this machine?"), PROGRAM_NAME)
, Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l->set_max_width_chars(80);
l->set_line_wrap();
vbox->pack_start (*l, true, true, 4);