diff options
author | Robin Gareus <robin@gareus.org> | 2018-11-19 03:20:11 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2018-11-19 03:20:11 +0100 |
commit | a5b38fd6dc9ce9d1fb450da493adbc02b787c5e8 (patch) | |
tree | d9d617f5db4fa61c9801578ceab4381132479569 /gtk2_ardour/transcode_ffmpeg.cc | |
parent | 4c6ff5f7e7ba8509259021e4ac9176224edd6036 (diff) |
Use libardour video-tool path (2/2)
Diffstat (limited to 'gtk2_ardour/transcode_ffmpeg.cc')
-rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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)); |