From 8a8dc9ca04c9ca2f9f7e30b525ca5c3251753b19 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 23 Apr 2014 21:27:05 +0200 Subject: [PATCH] fix xjadeo on windows (directly use xjadeo.exe) --- gtk2_ardour/video_timeline.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 0a90d80978..ea66a621e4 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -724,12 +724,8 @@ VideoTimeLine::find_xjadeo () { else if (Glib::file_test(X_("/Applications/Jadeo.app/Contents/MacOS/xjremote"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) { _xjadeo_bin = X_("/Applications/Jadeo.app/Contents/MacOS/xjremote"); } - /* TODO: win32: allow to configure PATH to xjremote */ - else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjremote.exe"), Glib::FILE_TEST_EXISTS)) { - _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjremote.exe"); - } - else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjremote.bat"), Glib::FILE_TEST_EXISTS)) { - _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjremote.bat"); + else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjadeo.exe"), Glib::FILE_TEST_EXISTS)) { + _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjadeo.exe"); } else { _xjadeo_bin = X_("");