Mercurial > mplayer.hg
view input/mouse.h @ 26146:20a126aaa756
ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.
I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).
| author | uau |
|---|---|
| date | Thu, 06 Mar 2008 01:57:26 +0000 |
| parents | 4129c8cfa742 |
| children | 142c53391eb7 |
line wrap: on
line source
#ifndef MPLAYER_MOUSE_H #define MPLAYER_MOUSE_H #define MOUSE_BASE ((0x100+256)|MP_NO_REPEAT_KEY) #define MOUSE_BTN0 (MOUSE_BASE+0) #define MOUSE_BTN1 (MOUSE_BASE+1) #define MOUSE_BTN2 (MOUSE_BASE+2) #define MOUSE_BTN3 (MOUSE_BASE+3) #define MOUSE_BTN4 (MOUSE_BASE+4) #define MOUSE_BTN5 (MOUSE_BASE+5) #define MOUSE_BTN6 (MOUSE_BASE+6) #define MOUSE_BTN7 (MOUSE_BASE+7) #define MOUSE_BTN8 (MOUSE_BASE+8) #define MOUSE_BTN9 (MOUSE_BASE+9) #define MOUSE_BASE_DBL (0x300|MP_NO_REPEAT_KEY) #define MOUSE_BTN0_DBL (MOUSE_BASE_DBL+0) #define MOUSE_BTN1_DBL (MOUSE_BASE_DBL+1) #define MOUSE_BTN2_DBL (MOUSE_BASE_DBL+2) #define MOUSE_BTN3_DBL (MOUSE_BASE_DBL+3) #define MOUSE_BTN4_DBL (MOUSE_BASE_DBL+4) #define MOUSE_BTN5_DBL (MOUSE_BASE_DBL+5) #define MOUSE_BTN6_DBL (MOUSE_BASE_DBL+6) #define MOUSE_BTN7_DBL (MOUSE_BASE_DBL+7) #define MOUSE_BTN8_DBL (MOUSE_BASE_DBL+8) #define MOUSE_BTN9_DBL (MOUSE_BASE_DBL+9) #endif /* MPLAYER_MOUSE_H */