From 23cb82907220d0c2724a0ec92bde437cbcd67d6a Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 25 Apr 2011 09:43:59 +0300 Subject: 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 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. --- input/input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'input/input.c') diff --git a/input/input.c b/input/input.c index 1dc57960db..f5e2d3824d 100644 --- a/input/input.c +++ b/input/input.c @@ -31,12 +31,11 @@ #include #include "input.h" -#include "mouse.h" #ifdef MP_DEBUG #include #endif #include "mp_fifo.h" -#include "osdep/keycodes.h" +#include "keycodes.h" #include "osdep/timer.h" #include "libavutil/avstring.h" #include "mp_msg.h" -- cgit v1.2.3