diff options
| author | wm4 <wm4@nowhere> | 2013-02-12 01:34:04 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-02-12 10:27:00 +0100 |
| commit | 75e6584ab3b06a02be37b447c397271c0d120b01 (patch) | |
| tree | bf912a16b719397df464fde4d46e6b84144a4029 /core/input/appleir.c | |
| parent | 3ded26ccba9831ef4b4a2b22f2989fd9d5e72964 (diff) | |
| download | mpv-75e6584ab3b06a02be37b447c397271c0d120b01.tar.bz2 mpv-75e6584ab3b06a02be37b447c397271c0d120b01.tar.xz | |
Prefix keycode defines with MP_
Do this to reduce conflicts with <linux/input.h>, which contains some
conflicting defines.
This changes the meaning of MP_KEY_DOWN:
KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key)
MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
Diffstat (limited to 'core/input/appleir.c')
| -rw-r--r-- | core/input/appleir.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/core/input/appleir.c b/core/input/appleir.c index 4615f1ef9d..e645ba736a 100644 --- a/core/input/appleir.c +++ b/core/input/appleir.c @@ -39,8 +39,6 @@ #include "core/mp_msg.h" -// keycodes.h defines would conflict with linux/input.h ones -#define AR_DEFINES_ONLY #include "keycodes.h" #define EVDEV_MAX_EVENTS 32 @@ -63,16 +61,16 @@ static const struct { int value; int mp_keycode; } apple_ir_mapping[] = { - { APPLE_IR_PLAY, 1, AR_PLAY }, - { APPLE_IR_PLAY, 2, AR_PLAY_HOLD }, - { APPLE_IR_FORWARD, 1, AR_NEXT }, - { APPLE_IR_FORWARD, 2, AR_NEXT_HOLD }, - { APPLE_IR_BACKWARD, 1, AR_PREV }, - { APPLE_IR_BACKWARD, 2, AR_PREV_HOLD }, - { APPLE_IR_MENU, 1, AR_MENU }, - { APPLE_IR_MENU, 2, AR_MENU_HOLD }, - { APPLE_IR_PLUS, 1, AR_VUP }, - { APPLE_IR_MINUS, 1, AR_VDOWN }, + { APPLE_IR_PLAY, 1, MP_AR_PLAY }, + { APPLE_IR_PLAY, 2, MP_AR_PLAY_HOLD }, + { APPLE_IR_FORWARD, 1, MP_AR_NEXT }, + { APPLE_IR_FORWARD, 2, MP_AR_NEXT_HOLD }, + { APPLE_IR_BACKWARD, 1, MP_AR_PREV }, + { APPLE_IR_BACKWARD, 2, MP_AR_PREV_HOLD }, + { APPLE_IR_MENU, 1, MP_AR_MENU }, + { APPLE_IR_MENU, 2, MP_AR_MENU_HOLD }, + { APPLE_IR_PLUS, 1, MP_AR_VUP }, + { APPLE_IR_MINUS, 1, MP_AR_VDOWN }, { -1, -1, -1 } }; |