OSX use xjadeo directly (no IPC indirection)
authorRobin Gareus <robin@gareus.org>
Thu, 12 Mar 2015 12:19:26 +0000 (13:19 +0100)
committerRobin Gareus <robin@gareus.org>
Thu, 12 Mar 2015 12:19:26 +0000 (13:19 +0100)
gtk2_ardour/video_tool_paths.cc

index 5b8f0725ca1a33015d2bcf39aca38cd29afc3d4f..6f3d56b48c8d004db476bfafdf7db1c9ed22ba2f 100644 (file)
@@ -115,11 +115,11 @@ 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/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