diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-27 19:06:50 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-27 19:06:50 +0000 |
commit | 88aca1ef25806c743f6ab95d3eed81ffc032f08d (patch) | |
tree | ac8b580a018ed9e03474f8e44b440ca30cc2a1c6 /input | |
parent | 7fcf438a2f3b169dac45f609571275336ce958f5 (diff) | |
download | mpv-88aca1ef25806c743f6ab95d3eed81ffc032f08d.tar.bz2 mpv-88aca1ef25806c743f6ab95d3eed81ffc032f08d.tar.xz |
Do not use select n lirc code, instead set the fd non-blocking.
select can not work because lirc_nextcode buffers data internally,
causing events to be delayed until the next keypress in some cases.
Patch by Dennis Vshivkov [jaimor (at) orcon net nz]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28380 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r-- | input/lirc.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/input/lirc.c b/input/lirc.c index 4012d5b340..7b9f675c04 100644 --- a/input/lirc.c +++ b/input/lirc.c @@ -20,11 +20,10 @@ #include <lirc/lirc_client.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <string.h> #include <unistd.h> -#include <sys/types.h> -#include <sys/time.h> #include <stdlib.h> #include "mp_msg.h" @@ -39,6 +38,7 @@ static char* cmd_buf = NULL; int mp_input_lirc_init(void) { int lirc_sock; + int mode; mp_msg(MSGT_LIRC,MSGL_V,MSGTR_SettingUpLIRC); if((lirc_sock=lirc_init("mplayer",1))==-1){ @@ -53,12 +53,18 @@ mp_input_lirc_init(void) { return -1; } + mode = fcntl(lirc_sock, F_GETFL); + if (mode < 0 || fcntl(lirc_sock, F_SETFL, mode | O_NONBLOCK) < 0) { + mp_msg(MSGT_LIRC, MSGL_ERR, "setting non-blocking mode failed: %s\n", + strerror(errno)); + lirc_deinit(); + return -1; + } + return lirc_sock; } int mp_input_lirc_read(int fd,char* dest, int s) { - fd_set fds; - struct timeval tv; int r,cl = 0; char *code = NULL,*c = NULL; @@ -77,20 +83,6 @@ int mp_input_lirc_read(int fd,char* dest, int s) { } // Nothing in the buffer, poll the lirc fd - FD_ZERO(&fds); - FD_SET(fd,&fds); - memset(&tv,0,sizeof(tv)); - while((r = select(fd+1,&fds,NULL,NULL,&tv)) <= 0) { - if(r < 0) { - if(errno == EINTR) - continue; - mp_msg(MSGT_INPUT,MSGL_ERR,"Select error : %s\n",strerror(errno)); - return MP_INPUT_ERROR; - } else - return MP_INPUT_NOTHING; - } - - // There's something to read if(lirc_nextcode(&code) != 0) { mp_msg(MSGT_INPUT,MSGL_ERR,"Lirc error :(\n"); return MP_INPUT_DEAD; |