[MPlayer-cvslog] CVS: main/input input.c, 1.117, 1.118 input.h, 1.56, 1.57 lirc.c, 1.5, 1.6

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/input
In directory mail:/var2/tmp/cvs-serv16741

Modified Files:
	input.c input.h lirc.c 
Log Message:
consume empty lirc events at once.
Patch by Lev A. Melnikovsky {leva at kapitza ras ru}.


Index: input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- input.c	9 Jun 2005 20:13:53 -0000	1.117
+++ input.c	27 Jun 2005 08:16:23 -0000	1.118
@@ -708,6 +708,8 @@
 	mp_msg(MSGT_INPUT,MSGL_ERR,"Error while reading cmd fd %d: %s\n",mp_fd->fd,strerror(errno));
       case MP_INPUT_NOTHING:
 	return r;
+      case MP_INPUT_RETRY:
+	continue;
       }
       // EOF ?
     } else if(r == 0) {

Index: input.h
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- input.h	9 Jun 2005 20:13:53 -0000	1.56
+++ input.h	27 Jun 2005 08:16:23 -0000	1.57
@@ -115,6 +115,8 @@
 #define MP_INPUT_DEAD -2
 // No input was available
 #define MP_INPUT_NOTHING -3
+//! Input will be available if you try again
+#define MP_INPUT_RETRY -4
 
 // For the key's drivers, if possible you can send key up and key down
 // events. Key up is the default, to send a key down you must use the 

Index: lirc.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/lirc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lirc.c	23 Oct 2002 22:23:12 -0000	1.5
+++ lirc.c	27 Jun 2005 08:16:23 -0000	1.6
@@ -102,7 +102,7 @@
   else if(cmd_buf) // return the first command in the buffer
     return mp_input_lirc_read(fd,dest,s);
   else
-    return MP_INPUT_NOTHING;
+    return MP_INPUT_RETRY;
 
 }