[vlc-commits] v4l2 access: remove polling timer

Rémi Denis-Courmont git at videolan.org
Wed Jul 1 18:22:10 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jun 30 23:52:51 2015 +0300| [57d784d7a7e8272d81a6f1847e0593c802f458f9] | committer: Rémi Denis-Courmont

v4l2 access: remove polling timer

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=57d784d7a7e8272d81a6f1847e0593c802f458f9
---

 modules/access/v4l2/access.c |   14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/modules/access/v4l2/access.c b/modules/access/v4l2/access.c
index 30dc7e9..95f450c 100644
--- a/modules/access/v4l2/access.c
+++ b/modules/access/v4l2/access.c
@@ -33,6 +33,7 @@
 
 #include <vlc_common.h>
 #include <vlc_access.h>
+#include <vlc_interrupt.h>
 
 #include "v4l2.h"
 
@@ -204,18 +205,7 @@ static int AccessPoll (access_t *access)
     ufd.fd = sys->fd;
     ufd.events = POLLIN;
 
-    switch (poll (&ufd, 1, 500))
-    {
-        case -1:
-            if (errno == EINTR)
-        case 0:
-            /* FIXME: kill this case (arbitrary timeout) */
-                return -1;
-            msg_Err (access, "poll error: %s", vlc_strerror_c(errno));
-            access->info.b_eof = true;
-            return -1;
-    }
-    return 0;
+    return vlc_poll_i11e (&ufd, 1, -1);
 }
 
 



More information about the vlc-commits mailing list