#endif
#include "pbd/file_utils.h"
+#include "ui_config.h"
#include "video_tool_paths.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace PBD;
+#ifdef PLATFORM_WINDOWS
+
+static bool
+windows_install_dir (const char *regkey, std::string &rv) {
+ HKEY key;
+ DWORD size = PATH_MAX;
+ char tmp[PATH_MAX+1];
+
+ if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, regkey, 0, KEY_READ, &key))
+ && (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
+ )
+ {
+ rv = Glib::locale_to_utf8(tmp);
+ return true;
+ }
+
+ if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, regkey, 0, KEY_READ | KEY_WOW64_32KEY, &key))
+ && (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
+ )
+ {
+ rv = Glib::locale_to_utf8(tmp);
+ return true;
+ }
+
+ return false;
+}
+#endif
+
bool
ArdourVideoToolPaths::harvid_exe (std::string &harvid_exe)
{
#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);
+ std::string reg;
+ std::string program_files = PBD::get_win_special_folder_path (CSIDL_PROGRAM_FILES);
#endif
harvid_exe = "";
harvid_exe = icsd_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))
- )
+ else if ( windows_install_dir("Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\video", reg))
{
- harvid_exe = g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "harvid.exe", NULL);
+ harvid_exe = g_build_filename(reg.c_str(), "harvid", "harvid.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))
- )
+ else if ( windows_install_dir("Software\\RSS\\harvid", reg))
{
- harvid_exe = g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "harvid.exe", NULL);
+ harvid_exe = g_build_filename(reg.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))
+ else if (!program_files.empty() && Glib::file_test(g_build_filename(program_files.c_str(), "harvid", "harvid.exe", NULL), Glib::FILE_TEST_EXISTS))
{
- harvid_exe = g_build_filename(program_files, "harvid", "harvid.exe", NULL);
+ harvid_exe = g_build_filename(program_files.c_str(), "harvid", "harvid.exe", NULL);
}
-#endif
- /* generic fallbacks to try */
else if (Glib::file_test(X_("C:\\Program Files\\harvid\\harvid.exe"), Glib::FILE_TEST_EXISTS)) {
harvid_exe = X_("C:\\Program Files\\harvid\\harvid.exe");
}
- else {
+#endif
+ else
+ {
return false;
}
return true;
{
std::string xjadeo_file_path;
#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);
+ std::string reg;
+ std::string program_files = PBD::get_win_special_folder_path (CSIDL_PROGRAM_FILES);
#endif
+ xjadeo_exe = X_("");
+
if (getenv("XJREMOTE")) {
xjadeo_exe = getenv("XJREMOTE");
+#ifdef __APPLE__
+ } else if (!UIConfiguration::instance().get_xjadeo_binary().empty()
+ && Glib::file_test (UIConfiguration::instance().get_xjadeo_binary() + "/Contents/MacOS/xjadeo", Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
+ xjadeo_exe = UIConfiguration::instance().get_xjadeo_binary() + "/Contents/MacOS/xjadeo";
+#endif
+ } else if (!UIConfiguration::instance().get_xjadeo_binary().empty()
+ && Glib::file_test (UIConfiguration::instance().get_xjadeo_binary(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
+ xjadeo_exe = UIConfiguration::instance().get_xjadeo_binary();
} else if (find_file (Searchpath(Glib::getenv("PATH")), X_("xjremote"), xjadeo_file_path)) {
xjadeo_exe = xjadeo_file_path;
} else if (find_file (Searchpath(Glib::getenv("PATH")), X_("xjadeo"), xjadeo_file_path)) {
xjadeo_exe = xjadeo_file_path;
}
#ifdef __APPLE__
- else if (Glib::file_test(X_("/Applications/Xjadeo.app/Contents/MacOS/xjremote"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
- xjadeo_exe = X_("/Applications/Xjadeo.app/Contents/MacOS/xjremote");
+ else if (Glib::file_test(X_("/Applications/Xjadeo.app/Contents/MacOS/xjadeo"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
+ xjadeo_exe = X_("/Applications/Xjadeo.app/Contents/MacOS/xjadeo");
}
- else if (Glib::file_test(X_("/Applications/Jadeo.app/Contents/MacOS/xjremote"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
- xjadeo_exe = X_("/Applications/Jadeo.app/Contents/MacOS/xjremote");
+ else if (Glib::file_test(X_("/Applications/Jadeo.app/Contents/MacOS/Jadeo-bin"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
+ xjadeo_exe = X_("/Applications/Jadeo.app/Contents/MacOS/Jadeo-bin");
}
#endif
#ifdef PLATFORM_WINDOWS
- else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\xjadeo", 0, KEY_READ, &key))
- && (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
- )
+ else if ( windows_install_dir("Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\video", reg))
{
- xjadeo_exe = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", NULL));
+ xjadeo_exe = std::string(g_build_filename(reg.c_str(), "xjadeo", "xjadeo.exe", NULL));
}
- else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\xjadeo", 0, KEY_READ | KEY_WOW64_32KEY, &key))
- && (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
- )
+ else if ( windows_install_dir("Software\\RSS\\xjadeo", reg))
{
- xjadeo_exe = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", NULL));
+ xjadeo_exe = std::string(g_build_filename(reg.c_str(), "xjadeo.exe", NULL));
}
- else if (program_files && Glib::file_test(g_build_filename(program_files, "xjadeo", "xjadeo.exe", NULL), Glib::FILE_TEST_EXISTS))
+ else if (!program_files.empty() && Glib::file_test(g_build_filename(program_files.c_str(), "xjadeo", "xjadeo.exe", NULL), Glib::FILE_TEST_EXISTS))
{
- xjadeo_exe = std::string(g_build_filename(program_files, "xjadeo", "xjadeo.exe", NULL));
+ xjadeo_exe = std::string(g_build_filename(program_files.c_str(), "xjadeo", "xjadeo.exe", NULL));
}
- /* generic fallback to try */
else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjadeo.exe"), Glib::FILE_TEST_EXISTS)) {
xjadeo_exe = X_("C:\\Program Files\\xjadeo\\xjadeo.exe");
}
#endif
- else {
- xjadeo_exe = X_("");
- return false;
- }
- return true;
+
+ return (!xjadeo_exe.empty() && Glib::file_test(xjadeo_exe, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE));
}
bool
ArdourVideoToolPaths::transcoder_exe (std::string &ffmpeg_exe, std::string &ffprobe_exe)
{
#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);
+ std::string reg;
+ std::string program_files = PBD::get_win_special_folder_path (CSIDL_PROGRAM_FILES);
#endif
ffmpeg_exe = X_("");
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))
- )
+ else if ( windows_install_dir("Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\video", reg))
{
- 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);
+ 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 ( (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))
- )
+ else if ( windows_install_dir("Software\\RSS\\harvid", reg))
{
- 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);
+ ffmpeg_exe = g_build_filename(reg.c_str(), X_("ffmpeg.exe"), NULL);
+ ffprobe_exe = g_build_filename(reg.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 (!program_files.empty() && Glib::file_test(g_build_filename(program_files.c_str(), "harvid", "ffmpeg.exe", NULL), Glib::FILE_TEST_EXISTS)) {
+ ffmpeg_exe = g_build_filename(program_files.c_str(), "harvid", "ffmpeg.exe", NULL);
}
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");
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 (!program_files.empty() && Glib::file_test(g_build_filename(program_files.c_str(), "harvid", "ffprobe.exe", NULL), Glib::FILE_TEST_EXISTS)) {
+ ffprobe_exe = g_build_filename(program_files.c_str(), "harvid", "ffprobe.exe", NULL);
}
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");
projects / ardour.git / blobdiff