smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

clarify missing ffmpeg messages

Browse source 
Don't refernce "ffmpeg", "ffprobe" executables directly. Refer to the
elaborate Log message (ffmpeg_harvid)
This commit is contained in:
Robin Gareus 2015-12-22 16:43:26 +01:00
parent 17c4a36a1a
commit 4abf943340
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/export_video_dialog.cc
View file

@ -112,7 +112,7 @@ ExportVideoDialog::ExportVideoDialog ()
/* check if ffmpeg can be found */ /* check if ffmpeg can be found */
_transcoder = new TranscodeFfmpeg(X_("")); _transcoder = new TranscodeFfmpeg(X_(""));
if (!_transcoder->ffexec_ok()) { if (!_transcoder->ffexec_ok()) {
l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Export is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); l = manage (new Label (_("ffmpeg installation was not found. Video Export is not possible. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l->set_line_wrap(); l->set_line_wrap();
vbox->pack_start (*l, false, false, 8); vbox->pack_start (*l, false, false, 8);
get_vbox()->pack_start (*vbox, false, false); get_vbox()->pack_start (*vbox, false, false);

4
gtk2_ardour/transcode_ffmpeg.cc
View file

@ -53,9 +53,9 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
if (!ArdourVideoToolPaths::transcoder_exe(ffmpeg_exe, ffprobe_exe)) { if (!ArdourVideoToolPaths::transcoder_exe(ffmpeg_exe, ffprobe_exe)) {
warning << string_compose( warning << string_compose(
_( _(
"No ffprobe or ffmpeg executables could be found on this system.\n" "ffmpeg installation was not 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" "%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
"Video import and export is not possible until you install tools.\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"

2
gtk2_ardour/transcode_video_dialog.cc
View file

@ -110,7 +110,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
bool ffok = false; bool ffok = false;
if (!transcoder->ffexec_ok()) { if (!transcoder->ffexec_ok()) {
l = manage (new Label (_("No ffprobe or ffmpeg executables could be found on this system. Video Import is not possible until you install those tools. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); l = manage (new Label (_("ffmpeg installation was not found. Video Import is not possible. See the Log window for more information."), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
l->set_line_wrap(); l->set_line_wrap();
options_box->pack_start (*l, false, true, 4); options_box->pack_start (*l, false, true, 4);
aspect_checkbox.set_sensitive(false); aspect_checkbox.set_sensitive(false);