summaryrefslogtreecommitdiff
path: root/gtk2_ardour/video_tool_paths.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-03-12 13:19:26 +0100
committerRobin Gareus <robin@gareus.org>2015-03-12 13:19:26 +0100
commitec4eb85cb9ae9ca4166fb6ec6d556a599e205abd (patch)
treeb99b0175f4c3585948dd329fad08231652d6684a /gtk2_ardour/video_tool_paths.cc
parentb0405c3c2ce0038cf8e4fac3fd17df80a475f1d1 (diff)
OSX use xjadeo directly (no IPC indirection)
Diffstat (limited to 'gtk2_ardour/video_tool_paths.cc')
-rw-r--r--gtk2_ardour/video_tool_paths.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/video_tool_paths.cc b/gtk2_ardour/video_tool_paths.cc
index 5b8f0725ca..6f3d56b48c 100644
--- a/gtk2_ardour/video_tool_paths.cc
+++ b/gtk2_ardour/video_tool_paths.cc
@@ -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