consolidate video-tool filepaths - step three:

prefer versions registered in HKLM Software\Ardour\video

diff --git a/gtk2_ardour/video_tool_paths.cc b/gtk2_ardour/video_tool_paths.cc
index 52614798994c5a1363d7eae5b4a22a37b1afc333..5cbbda769f6a3ccd25db280826fed13516b9675c 100644 (file)
--- 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);