summaryrefslogtreecommitdiffstats
path: root/input/input.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-23 22:23:12 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-23 22:23:12 +0000
commit288e2a0f4e0a02c762c65905d13ad704baece990 (patch)
treee35ca07c34471ccf4af10f95bac440134c9fdd7a /input/input.c
parent62e8e621431fe0b4ff9e15601b5110cbd861234a (diff)
downloadmpv-288e2a0f4e0a02c762c65905d13ad704baece990.tar.bz2
mpv-288e2a0f4e0a02c762c65905d13ad704baece990.tar.xz
rewrote the lirc code to remove the fork
patch by Albeu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7884 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input/input.c')
-rw-r--r--input/input.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/input/input.c b/input/input.c
index e12316c04d..50d9a04956 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1294,7 +1294,7 @@ mp_input_init(void) {
if(use_lirc) {
int fd = mp_input_lirc_init();
if(fd > 0)
- mp_input_add_cmd_fd(fd,1,NULL,(mp_close_func_t)close);
+ mp_input_add_cmd_fd(fd,0,mp_input_lirc_read,mp_input_lirc_close);
}
#endif
@@ -1327,12 +1327,6 @@ mp_input_uninit(void) {
cmd_fds[i].close_func(cmd_fds[i].fd);
}
-
-#ifdef HAVE_LIRC
- if(use_lirc)
- mp_input_lirc_uninit();
-#endif
-
}
void