summaryrefslogtreecommitdiffstats
path: root/input/input.c
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-04 14:19:54 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-04 14:19:54 +0000
commitb1abc1a384081642b7eef756e2b398d58ee60fe4 (patch)
treedb0c59ce954db6b1341bcbec9ff65b198f9d8b84 /input/input.c
parentf6787a2265915c08bf691784bc85caa5a46c3914 (diff)
downloadmpv-b1abc1a384081642b7eef756e2b398d58ee60fe4.tar.bz2
mpv-b1abc1a384081642b7eef756e2b398d58ee60fe4.tar.xz
Fix the bugs the previous version should fix (and those introduced
by the previous version ;) ) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4525 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input/input.c')
-rw-r--r--input/input.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/input/input.c b/input/input.c
index 648553c0fe..4db77d280e 100644
--- a/input/input.c
+++ b/input/input.c
@@ -76,10 +76,10 @@ static mp_cmd_bind_t key_names[] = {
{ KEY_DOWN, "DOWN" },
{ KEY_UP, "UP" },
#ifdef HAVE_JOYSTICK
- { JOY_AXIS1_PLUS, "JOY_UP" },
- { JOY_AXIS1_MINUS, "JOY_DOWN" },
- { JOY_AXIS0_PLUS, "JOY_LEFT" },
- { JOY_AXIS0_MINUS, "JOY_RIGHT" },
+ { JOY_AXIS1_MINUS, "JOY_UP" },
+ { JOY_AXIS1_PLUS, "JOY_DOWN" },
+ { JOY_AXIS0_MINUS, "JOY_LEFT" },
+ { JOY_AXIS0_PLUS, "JOY_RIGHT" },
{ JOY_AXIS0_PLUS, "JOY_AXIS0_PLUS" },
{ JOY_AXIS0_MINUS, "JOY_AXIS0_MINUS" },
@@ -817,7 +817,7 @@ mp_input_init(void) {
if(fd < 0)
printf("Can't init input joystick\n");
else
- mp_input_add_key_fd(fd,1,mp_input_joystick_read,mp_input_joystick_close);
+ mp_input_add_key_fd(fd,1,mp_input_joystick_read,(mp_close_func_t)close);
}
#endif