diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-04-25 09:43:59 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:43:31 +0300 |
| commit | 23cb82907220d0c2724a0ec92bde437cbcd67d6a (patch) | |
| tree | 1c1ea8667a2da5b6ddb5dd8e2f0c6f6558304ab5 /libvo/w32_common.c | |
| parent | 3e86228fad309b54869bf2a3314756933ba74e43 (diff) | |
| download | mpv-23cb82907220d0c2724a0ec92bde437cbcd67d6a.tar.bz2 mpv-23cb82907220d0c2724a0ec92bde437cbcd67d6a.tar.xz | |
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
<linux/input.h> 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.
Diffstat (limited to 'libvo/w32_common.c')
| -rw-r--r-- | libvo/w32_common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libvo/w32_common.c b/libvo/w32_common.c index 7cf374f717..9b89602f40 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -23,9 +23,8 @@ // To get "#define vo_ontop global_vo->opts->vo_ontop" etc #include "old_vo_defines.h" -#include "osdep/keycodes.h" +#include "input/keycodes.h" #include "input/input.h" -#include "input/mouse.h" #include "mp_msg.h" #include "video_out.h" #include "aspect.h" |