ardour/livetrax
13
0
Fork 0
Code

Cache the absence of ffmpeg_harvid

Browse Source 
Without this, absence of the transcode tool causes it to be searched for
for every entry in the file picker.
This commit is contained in:
Hector Martin 2021-09-04 14:43:45 +09:00 committed by Robin Gareus
parent a33261df3d
commit d4b0090850
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/video_tools_paths.cc
View File

@ -145,10 +145,14 @@ bool
ArdourVideoToolPaths::transcoder_exe (std::string &ffmpeg_exe, std::string &ffprobe_exe) ArdourVideoToolPaths::transcoder_exe (std::string &ffmpeg_exe, std::string &ffprobe_exe)
{ {
static bool _cached = false; static bool _cached = false;
static bool _success = false;
static std::string _ffmpeg_exe; static std::string _ffmpeg_exe;
static std::string _ffprobe_exe; static std::string _ffprobe_exe;
if (_cached) { if (_cached) {
if (!_success)
return false;
ffmpeg_exe = _ffmpeg_exe; ffmpeg_exe = _ffmpeg_exe;
ffprobe_exe = _ffprobe_exe; ffprobe_exe = _ffprobe_exe;
return true; return true;
@ -214,10 +218,13 @@ ArdourVideoToolPaths::transcoder_exe (std::string &ffmpeg_exe, std::string &ffpr
#endif #endif
if (_ffmpeg_exe.empty() || _ffprobe_exe.empty()) { if (_ffmpeg_exe.empty() || _ffprobe_exe.empty()) {
_cached = true;
_success = false;
return false; return false;
} }
_cached = true; _cached = true;
_success = true;
ffmpeg_exe = _ffmpeg_exe; ffmpeg_exe = _ffmpeg_exe;
ffprobe_exe = _ffprobe_exe; ffprobe_exe = _ffprobe_exe;