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

add manual reference to missing video-tools warnings

Browse Source
This commit is contained in:
Robin Gareus 2014-04-11 17:01:26 +02:00
parent 8bd6de3f4e
commit 670c066793
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/transcode_ffmpeg.cc
View File

@ -71,17 +71,19 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
if (ffmpeg_exe.empty() || ffprobe_exe.empty()) { if (ffmpeg_exe.empty() || ffprobe_exe.empty()) {
warning << string_compose( warning << string_compose(
_( _(
"No ffprobe or ffmpeg executables could be found on this system.\n" "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" "Video import and export is not possible until you install those tools.\n"
"%1 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" "\n"
"The tools are included with the %1 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" "and also available with the video-server at http://x42.github.com/harvid/\n"
"\n" "\n"
"Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\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 " "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" "symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
), PROGRAM_NAME) << endmsg; "\n"
"see also http://manual.ardour.org/video-timeline/setup/"
), PROGRAM_NAME) << endmsg;
return; return;
} }
ffexecok = true; ffexecok = true;

9
gtk2_ardour/video_server_dialog.cc
View File

@ -89,8 +89,13 @@ VideoServerDialog::VideoServerDialog (Session* s)
else { else {
PBD::warning << PBD::warning <<
string_compose( string_compose(
_("The external video server 'harvid' can not be found. The tool is included with the %1 releases from ardour.org, " _("The external video server 'harvid' can not be found.\n"
"alternatively you can download it from http://x42.github.com/harvid/ or acquire it from your distribution."), PROGRAM_NAME) "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.\n"
"\n"
"see also http://manual.ardour.org/video-timeline/setup/"
), PROGRAM_NAME)
<< endmsg; << endmsg;
} }

4
gtk2_ardour/video_timeline.cc
View File

@ -736,7 +736,9 @@ VideoTimeLine::find_xjadeo () {
_xjadeo_bin = X_(""); _xjadeo_bin = X_("");
warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ " warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
"(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. " "(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. "
"It should point to an application compatible with xjadeo's remote-control interface 'xjremote').") "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').\n"
"\n"
"see also http://manual.ardour.org/video-timeline/setup/")
<< endmsg; << endmsg;
} }
} }