diff options
author | Uoti Urpala <uau@mplayer2.org> | 2011-04-25 09:43:59 +0300 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:43:31 +0300 |
commit | 23cb82907220d0c2724a0ec92bde437cbcd67d6a (patch) | |
tree | 1c1ea8667a2da5b6ddb5dd8e2f0c6f6558304ab5 /input/ar.h | |
parent | 3e86228fad309b54869bf2a3314756933ba74e43 (diff) | |
download | mpv-23cb82907220d0c2724a0ec92bde437cbcd67d6a.tar.bz2 mpv-23cb82907220d0c2724a0ec92bde437cbcd67d6a.tar.xz |
input: move all key code lists to input/keycodes.h
Move the definitions of all special key codes (those not passed by
ASCII value) to input/keycodes.h. Before they were spread between
osdep/keycodes.h, input/joystick.h, input/mouse.h and input/ar.h, plus
some special values in input.h. This was especially inconvenient as
the codes had to be coordinated to not conflict between the files.
The change requires a bit of ugliness as appleir.c includes
<linux/input.h> which contains various conflicting KEY_* definitions.
Work around this by adding a special preprocessor variable which can
be used to avoid defining these in keycodes.h.
Diffstat (limited to 'input/ar.h')
-rw-r--r-- | input/ar.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/input/ar.h b/input/ar.h index 12944f84e1..56b88d5823 100644 --- a/input/ar.h +++ b/input/ar.h @@ -23,18 +23,6 @@ #ifndef MPLAYER_AR_H #define MPLAYER_AR_H -#define AR_BASE 0x500 -#define AR_PLAY (AR_BASE + 0) -#define AR_PLAY_HOLD (AR_BASE + 1) -#define AR_NEXT (AR_BASE + 2) -#define AR_NEXT_HOLD (AR_BASE + 3) -#define AR_PREV (AR_BASE + 4) -#define AR_PREV_HOLD (AR_BASE + 5) -#define AR_MENU (AR_BASE + 6) -#define AR_MENU_HOLD (AR_BASE + 7) -#define AR_VUP (AR_BASE + 8) -#define AR_VDOWN (AR_BASE + 9) - /* MacOSX Driver */ int mp_input_ar_init(void); int mp_input_ar_read(void *ctx, int fd); |