Mercurial > mplayer.hg
changeset 27943:c25cbf15a51c
Simplify handling of "flags" parameter
| author | reimar |
|---|---|
| date | Fri, 21 Nov 2008 23:17:26 +0000 |
| parents | 49f5c51e1945 |
| children | 7b03da3f5a9f |
| files | libvo/vo_x11.c |
| diffstat | 1 files changed, 4 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_x11.c Fri Nov 21 23:14:38 2008 +0000 +++ b/libvo/vo_x11.c Fri Nov 21 23:17:26 2008 +0000 @@ -303,7 +303,6 @@ uint32_t format) { // int screen; - int fullscreen = 0; // int interval, prefer_blank, allow_exp, nothing; unsigned int fg, bg; @@ -314,8 +313,11 @@ const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt; #ifdef CONFIG_XF86VM - int vm = 0; + int vm = flags & VOFLAG_MODESWITCHING; #endif + int fullscreen = flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING); + Flip_Flag = flags & VOFLAG_FLIPPING; + zoomFlag = flags & VOFLAG_SWSCALE; old_vo_dwidth = -1; old_vo_dheight = -1; @@ -328,17 +330,6 @@ srcW = width; srcH = height; - if (flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING)) - fullscreen = 1; -#ifdef CONFIG_XF86VM - if (flags & VOFLAG_MODESWITCHING) - vm = 1; -#endif - Flip_Flag = 0; - if (flags & VOFLAG_FLIPPING) - Flip_Flag = 1; - zoomFlag = flags & VOFLAG_SWSCALE; - // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight );