smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

update harvid & ffmpeg binary path discovery on windows (64 & 32 bit)

Browse source
This commit is contained in:
Robin Gareus 2014-11-23 23:55:41 +01:00
parent 8ddeb712f6
commit 1b6cbf743b
2 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gtk2_ardour/transcode_ffmpeg.cc
View file

@ -73,17 +73,24 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
&& (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size)) && (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")); 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")); 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)) { 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", 0), 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", 0); 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", 0), Glib::FILE_TEST_EXISTS)) { 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", 0); ffmpeg_exe = g_build_filename(program_files, "harvid", "ffmpeg.exe", NULL);
} }
/* generic fallbacks to try */ /* generic fallbacks to try */
else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffmpeg.exe"), Glib::FILE_TEST_EXISTS)) { else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffmpeg.exe"), Glib::FILE_TEST_EXISTS)) {
@ -103,11 +110,11 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
if (Glib::file_test(ffprobe_exe, Glib::FILE_TEST_EXISTS)) { 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", 0), 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", 0); 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", 0), Glib::FILE_TEST_EXISTS)) { 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", 0); ffmpeg_exe = g_build_filename(program_files, "harvid", "ffprobe.exe", NULL);
} }
/* generic fallbacks to try */ /* generic fallbacks to try */
else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffprobe.exe"), Glib::FILE_TEST_EXISTS)) { else if (Glib::file_test(X_("C:\\Program Files\\harvid\\ffprobe.exe"), Glib::FILE_TEST_EXISTS)) {

12
gtk2_ardour/video_server_dialog.cc
View file

@ -109,11 +109,17 @@ VideoServerDialog::VideoServerDialog (Session* s)
&& (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size)) && (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
) )
{ {
path_entry.set_text(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "harvid.exe", 0)); path_entry.set_text(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "harvid.exe", NULL));
} }
else if (program_files && Glib::file_test(g_build_filename(program_files, "harvid", "harvid.exe", 0), Glib::FILE_TEST_EXISTS)) 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))
)
{ {
path_entry.set_text(g_build_filename(program_files, "harvid", "harvid.exe", 0)); path_entry.set_text(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "harvid.exe", NULL));
}
else if (program_files && Glib::file_test(g_build_filename(program_files, "harvid", "harvid.exe", NULL), Glib::FILE_TEST_EXISTS))
{
path_entry.set_text(g_build_filename(program_files, "harvid", "harvid.exe", NULL));
} }
#endif #endif
/* generic fallbacks to try */ /* generic fallbacks to try */