diff options
author | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
commit | 0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2 (patch) | |
tree | b70f214f8c3fc802d6d6edbf8395273c854ac0fd /input/lirc.h | |
parent | a4fe95b0d8d339ba5afbdb5346ad8fd367a4a1c1 (diff) | |
parent | 245e5b844177e9ad9a9c07eff5efab7c3fccdebc (diff) | |
download | mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.bz2 mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.xz |
Merge branch 'msg_refactor'
This branch changes mp_msg() so that it doesn't require global context.
The changes are pretty violent.
Diffstat (limited to 'input/lirc.h')
-rw-r--r-- | input/lirc.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/input/lirc.h b/input/lirc.h index ac1937f91d..6ff894d387 100644 --- a/input/lirc.h +++ b/input/lirc.h @@ -19,12 +19,9 @@ #ifndef MPLAYER_LIRC_H #define MPLAYER_LIRC_H -int -mp_input_lirc_init(void); - -int -mp_input_lirc_read(int fd,char* dest, int s); - -int mp_input_lirc_close(int fd); +struct input_ctx; +struct mp_log; +int mp_input_lirc_init(struct input_ctx *ictx, struct mp_log *log, + char *lirc_configfile); #endif /* MPLAYER_LIRC_H */ |