From b8a0605f4b8d80fdbf4932922960b8fb512f5e5c Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 21 Nov 2008 23:17:26 +0000 Subject: Simplify handling of "flags" parameter git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27977 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_x11.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'libvo') diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index fae5bcef23..6318ad5392 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -303,7 +303,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t format) { // int screen; - int fullscreen = 0; // int interval, prefer_blank, allow_exp, nothing; unsigned int fg, bg; @@ -314,8 +313,11 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, 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 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, 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 ); -- cgit v1.2.3