allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Fix setting custom path to the video monitor on macOS

Browse Source
This commit is contained in:
Robin Gareus
2021-10-06 05:06:29 +02:00
parent 89c17dfe7d
commit cc084ef0a7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/video_tools_paths.cc
View File

@@ -101,8 +101,11 @@ ArdourVideoToolPaths::xjadeo_exe (std::string &xjadeo_exe)
xjadeo_exe = getenv("XJREMOTE");
#ifdef __APPLE__
} 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)) {
xjadeo_exe = Config->get_xjadeo_binary() + "/Contents/MacOS/xjadeo";
&& 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/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
} else if (!Config->get_xjadeo_binary().empty()
&& 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;
}
#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)) {
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
#ifdef PLATFORM_WINDOWS
else if (PBD::windows_query_registry ("Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\video", "Install_Dir", reg))