From 75e6584ab3b06a02be37b447c397271c0d120b01 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 12 Feb 2013 01:34:04 +0100 Subject: Prefix keycode defines with MP_ Do this to reduce conflicts with , 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) --- core/input/joystick.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/input/joystick.c') 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 -- cgit v1.2.3