consolidate video-tool filepaths - step one

1:1 cut/paste

1 files changed, 2 insertions, 79 deletions

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 6b826e5775..b9da8948fa 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -29,12 +29,7 @@
 
 #include "transcode_ffmpeg.h"
 #include "utils_videotl.h"
-
-#ifdef PLATFORM_WINDOWS
-#include <windows.h>
-#include <shlobj.h> // CSIDL_*
-#include "pbd/windows_special_dirs.h"
-#endif
+#include "video_tool_paths.h"
 
 #include "i18n.h"
 
@@ -46,8 +41,6 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
 {
 	probeok = false;
 	ffexecok = false;
-	ffmpeg_exe = "";
-	ffprobe_exe = "";
 	m_duration = 0;
 	m_avoffset = m_lead_in = m_lead_out = 0;
 	m_width = m_height = 0;
@@ -57,77 +50,7 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
 	debug_enable = false;
 #endif
 
-#ifdef PLATFORM_WINDOWS
-	HKEY key;
-	DWORD size = PATH_MAX;
-	char tmp[PATH_MAX+1];
-	const char *program_files = PBD::get_win_special_folder (CSIDL_PROGRAM_FILES);
-#endif
-
-	std::string ff_file_path;
-	if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffmpeg_harvid"), ff_file_path)) {
-		ffmpeg_exe = ff_file_path;
-	}
-#ifdef PLATFORM_WINDOWS
-	else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\harvid", 0, KEY_READ, &key))
-			&&  (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
-			)
-	{
-		ffmpeg_exe = g_build_filename(Glib::locale_to_utf8(tmp).c_str(), X_("ffmpeg.exe"), NULL);
-		ffprobe_exe = g_build_filename(Glib::locale_to_utf8(tmp).c_str(), X_("ffprobe.exe"), NULL);
-	}
-	else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\harvid", 0, KEY_READ | KEY_WOW64_32KEY, &key))
-			&&  (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
-			)
-	{
-		ffmpeg_exe = g_build_filename(Glib::locale_to_utf8(tmp).c_str(), X_("ffmpeg.exe"), NULL);
-		ffprobe_exe = g_build_filename(Glib::locale_to_utf8(tmp).c_str(), X_("ffprobe.exe"), NULL);
-	}
-	if (Glib::file_test(ffmpeg_exe, Glib::FILE_TEST_EXISTS)) {
-		;
-	}
-	else if (program_files && Glib::file_test(g_build_filename(program_files, "harvid", "ffmpeg.exe", NULL), Glib::FILE_TEST_EXISTS)) {
-		ffmpeg_exe = g_build_filename(program_files, "harvid", "ffmpeg.exe", NULL);
-	}
-	else if (program_files && Glib::file_test(g_build_filename(program_files, "ffmpeg", "ffmpeg.exe", NULL), Glib::FILE_TEST_EXISTS)) {
-		ffmpeg_exe = g_build_filename(program_files, "harvid", "ffmpeg.exe", NULL);
-	}
-	/* generic fallbacks to try */
-	else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffmpeg.exe"), Glib::FILE_TEST_EXISTS)) {
-		ffmpeg_exe = X_("C:\\Program Files\\harvid\\ffmpeg.exe");
-	}
-	else if (Glib::file_test(X_("C:\\Program Files\\ffmpeg\\ffmpeg.exe"), Glib::FILE_TEST_EXISTS)) {
-		ffmpeg_exe = X_("C:\\Program Files\\ffmpeg\\ffmpeg.exe");
-	} else {
-		ffmpeg_exe = X_("");
-	}
-#endif
-
-	if (find_file (Searchpath(Glib::getenv("PATH")), X_("ffprobe_harvid"), ff_file_path)) {
-		ffprobe_exe = ff_file_path;
-	}
-#ifdef PLATFORM_WINDOWS
-	if (Glib::file_test(ffprobe_exe, Glib::FILE_TEST_EXISTS)) {
-		;
-	}
-	else if (program_files && Glib::file_test(g_build_filename(program_files, "harvid", "ffprobe.exe", NULL), Glib::FILE_TEST_EXISTS)) {
-		ffmpeg_exe = g_build_filename(program_files, "harvid", "ffprobe.exe", NULL);
-	}
-	else if (program_files && Glib::file_test(g_build_filename(program_files, "ffmpeg", "ffprobe.exe", NULL), Glib::FILE_TEST_EXISTS)) {
-		ffmpeg_exe = g_build_filename(program_files, "harvid", "ffprobe.exe", NULL);
-	}
-	/* generic fallbacks to try */
-	else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffprobe.exe"), Glib::FILE_TEST_EXISTS)) {
-		ffprobe_exe = X_("C:\\Program Files\\harvid\\ffprobe.exe");
-	}
-	else if (Glib::file_test(X_("C:\\Program Files\\ffmpeg\\ffprobe.exe"), Glib::FILE_TEST_EXISTS)) {
-		ffprobe_exe = X_("C:\\Program Files\\ffmpeg\\ffprobe.exe");
-	} else {
-		ffprobe_exe = X_("");
-	}
-#endif
-
-	if (ffmpeg_exe.empty() || ffprobe_exe.empty()) {
+	if (!ArdourVideoToolPaths::transcoder_exe(ffmpeg_exe, ffprobe_exe)) {
 		warning << string_compose(
 				_(
 					"No ffprobe or ffmpeg executables could be found on this system.\n"