From 643c083ce09d285ad3a93187a5224472c159542a Mon Sep 17 00:00:00 2001 From: "hadess@cookie.hadess.net" Date: Sat, 5 May 2007 00:41:54 +0100 Subject: - Fix _x_io_select exiting when the select has been interrupted (EINTR errno) when we want to run until the timeout has occurred, partially fixes Totem's browser plugin playing back browser streams with the xine-lib backend See http://bugzilla.gnome.org/show_bug.cgi?id=375866 for details --- src/xine-engine/io_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c index ad36c565e..67dddcfdc 100644 --- a/src/xine-engine/io_helper.c +++ b/src/xine-engine/io_helper.c @@ -276,7 +276,7 @@ int _x_io_select (xine_stream_t *stream, int fd, int state, int timeout_msec) { wset = (state & XIO_WRITE_READY) ? &fdset : NULL; ret = select (fd + 1, rset, wset, NULL, &select_timeout); - if (ret == -1) { + if (ret == -1 && errno != EINTR) { /* select error */ return XIO_ERROR; } else if (ret == 1) { -- cgit v1.2.3 From 89a988361909cc345663d8f7d777a006a605e9c9 Mon Sep 17 00:00:00 2001 From: "hadess@cookie.hadess.net" Date: Sat, 5 May 2007 01:03:47 +0100 Subject: Up the version number in HG so we can check for the _x_io_select fix --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b43bd1b8f..003af6722 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl XINE_SUB += 1; continue with XINE_LT_* values below dnl XINE_MAJOR=1 XINE_MINOR=1 -XINE_SUB=6 +XINE_SUB=7 #if test $XINE_SUB -eq 0 ; then # XINE_SUBPART=""; -- cgit v1.2.3