Fix setting custom path to the video monitor on macOS
This commit is contained in:
parent
89c17dfe7d
commit
cc084ef0a7
@ -101,8 +101,11 @@ ArdourVideoToolPaths::xjadeo_exe (std::string &xjadeo_exe)
|
|||||||
xjadeo_exe = getenv("XJREMOTE");
|
xjadeo_exe = getenv("XJREMOTE");
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
} else if (!Config->get_xjadeo_binary().empty()
|
} else if (!Config->get_xjadeo_binary().empty()
|
||||||
&& Glib::file_test (Config->get_xjadeo_binary() + "/Contents/MacOS/xjadeo", Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
|
&& Glib::file_test (Config->get_xjadeo_binary() + "/Contents/MacOS/Jadeo-bin", Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
|
||||||
xjadeo_exe = Config->get_xjadeo_binary() + "/Contents/MacOS/xjadeo";
|
xjadeo_exe = Config->get_xjadeo_binary() + "/Contents/MacOS/Jadeo-bin";
|
||||||
|
} else if (!Config->get_xjadeo_binary().empty()
|
||||||
|
&& Glib::file_test (Config->get_xjadeo_binary() + "/Contents/MacOS/xjremote", Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
|
||||||
|
xjadeo_exe = Config->get_xjadeo_binary() + "/Contents/MacOS/xjremote";
|
||||||
#endif
|
#endif
|
||||||
} else if (!Config->get_xjadeo_binary().empty()
|
} else if (!Config->get_xjadeo_binary().empty()
|
||||||
&& Glib::file_test (Config->get_xjadeo_binary(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
|
&& Glib::file_test (Config->get_xjadeo_binary(), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
|
||||||
@ -113,12 +116,12 @@ ArdourVideoToolPaths::xjadeo_exe (std::string &xjadeo_exe)
|
|||||||
xjadeo_exe = xjadeo_file_path;
|
xjadeo_exe = xjadeo_file_path;
|
||||||
}
|
}
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
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/Jadeo-bin"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
|
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");
|
xjadeo_exe = X_("/Applications/Jadeo.app/Contents/MacOS/Jadeo-bin");
|
||||||
}
|
}
|
||||||
|
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");
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef PLATFORM_WINDOWS
|
#ifdef PLATFORM_WINDOWS
|
||||||
else if (PBD::windows_query_registry ("Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\video", "Install_Dir", reg))
|
else if (PBD::windows_query_registry ("Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\video", "Install_Dir", reg))
|
||||||
|
Loading…
Reference in New Issue
Block a user