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. --- libvo/vo_corevideo.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libvo/vo_corevideo.m') diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m index 23ef30d832..3b83051eb7 100644 --- a/libvo/vo_corevideo.m +++ b/libvo/vo_corevideo.m @@ -44,9 +44,7 @@ #include "subopt-helper.h" #include "input/input.h" -#include "input/mouse.h" - -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "osx_common.h" //Cocoa -- cgit v1.2.3