diff options
| author | Robin Gareus <robin@gareus.org> | 2014-12-23 23:00:18 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-12-23 23:43:24 +0100 |
| commit | 30c648f335980406ab236fc01ed0507935918085 (patch) | |
| tree | 304bc35a0d66a290fab2b91698a3486e0b7fcc63 /gtk2_ardour/video_tool_paths.cc | |
| parent | 67f6f84224c673bb786ab09d23fe3fcb8c992b63 (diff) | |
consolidate video-tool filepaths - step three:
prefer versions registered in HKLM Software\Ardour\video
Diffstat (limited to 'gtk2_ardour/video_tool_paths.cc')
| -rw-r--r-- | gtk2_ardour/video_tool_paths.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gtk2_ardour/video_tool_paths.cc b/gtk2_ardour/video_tool_paths.cc index 5261479899..5cbbda769f 100644 --- a/gtk2_ardour/video_tool_paths.cc +++ b/gtk2_ardour/video_tool_paths.cc @@ -76,6 +76,10 @@ ArdourVideoToolPaths::harvid_exe (std::string &harvid_exe) harvid_exe = icsd_file_path; } #ifdef PLATFORM_WINDOWS + else if ( windows_install_dir("Software\\Ardour\\video", reg)) + { + harvid_exe = g_build_filename(reg.c_str(), "harvid", "harvid.exe", NULL); + } else if ( windows_install_dir("Software\\RSS\\harvid", reg)) { harvid_exe = g_build_filename(reg.c_str(), "harvid.exe", NULL); @@ -119,6 +123,10 @@ ArdourVideoToolPaths::xjadeo_exe (std::string &xjadeo_exe) } #endif #ifdef PLATFORM_WINDOWS + else if ( windows_install_dir("Software\\Ardour\\video", reg)) + { + xjadeo_exe = std::string(g_build_filename(reg.c_str(), "xjadeo", "xjadeo.exe", NULL)); + } else if ( windows_install_dir("Software\\RSS\\xjadeo", reg)) { xjadeo_exe = std::string(g_build_filename(reg.c_str(), "xjadeo.exe", NULL)); @@ -154,6 +162,11 @@ ArdourVideoToolPaths::transcoder_exe (std::string &ffmpeg_exe, std::string &ffpr ffmpeg_exe = ff_file_path; } #ifdef PLATFORM_WINDOWS + else if ( windows_install_dir("Software\\Ardour\\video", reg)) + { + ffmpeg_exe = g_build_filename(reg.c_str(), X_("harvid"), X_("ffmpeg.exe"), NULL); + ffprobe_exe = g_build_filename(reg.c_str(), X_("harvid"), X_("ffprobe.exe"), NULL); + } else if ( windows_install_dir("Software\\RSS\\harvid", reg)) { ffmpeg_exe = g_build_filename(reg.c_str(), X_("ffmpeg.exe"), NULL); |