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/joystick.c | |
parent | 3ded26ccba9831ef4b4a2b22f2989fd9d5e72964 (diff) |
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/joystick.c')
-rw-r--r-- | core/input/joystick.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/input/joystick.c b/core/input/joystick.c index ae2bf7990b..17b4279c39 100644 --- a/core/input/joystick.c +++ b/core/input/joystick.c @@ -137,18 +137,18 @@ int mp_input_joystick_read(void *ctx, int fd) { btns &= ~(1 << ev.number); btns |= (ev.value << ev.number); if(ev.value == 1) - return (JOY_BTN0 + ev.number) | MP_KEY_DOWN; + return (MP_JOY_BTN0 + ev.number) | MP_KEY_STATE_DOWN; else - return JOY_BTN0 + ev.number; + return MP_JOY_BTN0 + ev.number; } else if(ev.type & JS_EVENT_AXIS) { if(ev.value < -JOY_AXIS_DELTA && axis[ev.number] != -1) { axis[ev.number] = -1; - return (JOY_AXIS0_MINUS+(2*ev.number)) | MP_KEY_DOWN; + return (MP_JOY_AXIS0_MINUS+(2*ev.number)) | MP_KEY_STATE_DOWN; } else if(ev.value > JOY_AXIS_DELTA && axis[ev.number] != 1) { axis[ev.number] = 1; - return (JOY_AXIS0_PLUS+(2*ev.number)) | MP_KEY_DOWN; + return (MP_JOY_AXIS0_PLUS+(2*ev.number)) | MP_KEY_STATE_DOWN; } else if(ev.value <= JOY_AXIS_DELTA && ev.value >= -JOY_AXIS_DELTA && axis[ev.number] != 0) { - int r = axis[ev.number] == 1 ? JOY_AXIS0_PLUS+(2*ev.number) : JOY_AXIS0_MINUS+(2*ev.number); + int r = axis[ev.number] == 1 ? MP_JOY_AXIS0_PLUS+(2*ev.number) : MP_JOY_AXIS0_MINUS+(2*ev.number); axis[ev.number] = 0; return r; } else |