summaryrefslogtreecommitdiff
path: root/gtk2_ardour/video_timeline.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-02-28 17:06:28 +0100
committerRobin Gareus <robin@gareus.org>2016-02-28 17:06:28 +0100
commit88c839d0789b80330c934024e4c9ae9faafe916e (patch)
treeffdd9279cbcf190a62afec570bc1aff734c1f5ff /gtk2_ardour/video_timeline.cc
parent2c47dd98c57084f7cdf5a20edb2ad31e001ab8ad (diff)
allow to configure custom path to video monitor
Diffstat (limited to 'gtk2_ardour/video_timeline.cc')
-rw-r--r--gtk2_ardour/video_timeline.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index a1dd4bcfbb..713ca1ca12 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -746,7 +746,12 @@ VideoTimeLine::find_xjadeo () {
return;
}
- version_check.wait ();
+#ifdef PLATFORM_WINDOWS
+ version_check.wait (); // 40ms timeout
+#else
+ version_check.wait (WNOHANG);
+#endif
+
int timeout = 300;
while (xjadeo_version.empty() && --timeout) {
Glib::usleep(10000);