From cc084ef0a7dbb340ef8196f873ec508e1218d96d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 6 Oct 2021 05:06:29 +0200 Subject: [PATCH] Fix setting custom path to the video monitor on macOS --- libs/ardour/video_tools_paths.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libs/ardour/video_tools_paths.cc b/libs/ardour/video_tools_paths.cc index b1b4f1d17a..ae870a9cec 100644 --- a/libs/ardour/video_tools_paths.cc +++ b/libs/ardour/video_tools_paths.cc @@ -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))