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/joystick.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/joystick.h')
| -rw-r--r-- | input/joystick.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/input/joystick.h b/input/joystick.h index b9480eb686..7dc3883c83 100644 --- a/input/joystick.h +++ b/input/joystick.h @@ -19,8 +19,8 @@ #ifndef MPLAYER_JOYSTICK_H #define MPLAYER_JOYSTICK_H -int mp_input_joystick_init(char* dev); - -int mp_input_joystick_read(void *ctx, int fd); +struct input_ctx; +struct mp_log; +int mp_input_joystick_init(struct input_ctx *ictx, struct mp_log *log, char *dev); #endif /* MPLAYER_JOYSTICK_H */ |