From a5b38fd6dc9ce9d1fb450da493adbc02b787c5e8 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 19 Nov 2018 03:20:11 +0100 Subject: Use libardour video-tool path (2/2) --- gtk2_ardour/transcode_ffmpeg.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/transcode_ffmpeg.cc') diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index bf8fe5fff9..3b3239c2ef 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -27,9 +27,10 @@ #include "pbd/file_utils.h" #include "gui_thread.h" +#include "ardour/filesystem_paths.h" + #include "transcode_ffmpeg.h" #include "utils_videotl.h" -#include "video_tool_paths.h" #include "pbd/i18n.h" @@ -50,7 +51,7 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f) debug_enable = false; #endif - if (!ArdourVideoToolPaths::transcoder_exe(ffmpeg_exe, ffprobe_exe)) { + if (!ARDOUR::ArdourVideoToolPaths::transcoder_exe(ffmpeg_exe, ffprobe_exe)) { warning << string_compose( _( "ffmpeg installation was not found on this system.\n" @@ -598,7 +599,6 @@ TranscodeFfmpeg::ffmpegparse_v (std::string d, size_t /* s */) printf("ffmpeg: '%s'\n", d.c_str()); } #endif - Progress(0, 0); /* EMIT SIGNAL */ return; } ARDOUR::samplecnt_t f = atol(d.substr(6)); -- cgit v1.2.3