summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2014-04-11 17:01:26 +0200
committerRobin Gareus <robin@gareus.org>2014-04-11 17:24:50 +0200
commit670c066793bb6608070923277fca2fc9dc43d4d2 (patch)
treef9a1d3ed3322202b0921f0ea8c8a040c5250e548
parent8bd6de3f4e450451b6e75e64660141bb997d51d0 (diff)
add manual reference to missing video-tools warnings
-rw-r--r--gtk2_ardour/transcode_ffmpeg.cc24
-rw-r--r--gtk2_ardour/video_server_dialog.cc9
-rw-r--r--gtk2_ardour/video_timeline.cc4
3 files changed, 23 insertions, 14 deletions
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index ce9a01e4f5..3cc45d217d 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -71,17 +71,19 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
if (ffmpeg_exe.empty() || ffprobe_exe.empty()) {
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"
- "%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
- "\n"
- "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"
- ), PROGRAM_NAME) << endmsg;
+ "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"
+ "%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+ "\n"
+ "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"
+ "\n"
+ "see also http://manual.ardour.org/video-timeline/setup/"
+ ), PROGRAM_NAME) << endmsg;
return;
}
ffexecok = true;
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 18a4d21dc9..2f22065a10 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -89,8 +89,13 @@ VideoServerDialog::VideoServerDialog (Session* s)
else {
PBD::warning <<
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)
+ _("The external video server 'harvid' can not be found.\n"
+ "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;
}
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 75f6150691..33331dbc8a 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -736,7 +736,9 @@ VideoTimeLine::find_xjadeo () {
_xjadeo_bin = X_("");
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. "
- "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;
}
}