From 60b5834701211b51e33759480071d2eff1c59b8b Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 15 Nov 2008 15:50:47 +0000 Subject: Cosmetic changes to vo_x11 to reduce diff to vo_xv for future refactoring. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27914 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_x11.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libvo/vo_x11.c') diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index fab0f6c2e1..29e4853ea9 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -304,7 +304,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, { // int screen; int fullscreen = 0; - int vm = 0; // int interval, prefer_blank, allow_exp, nothing; unsigned int fg, bg; @@ -315,6 +314,7 @@ 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; unsigned int modeline_width, modeline_height; static uint32_t vm_width; static uint32_t vm_height; @@ -324,6 +324,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, old_vo_dwidth = -1; old_vo_dheight = -1; + int_pause = 0; if (!title) title = "MPlayer X11 (XImage/Shm) render"; @@ -333,13 +334,14 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, if (flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING)) fullscreen = 1; +#ifdef CONFIG_XF86VM if (flags & VOFLAG_MODESWITCHING) vm = 1; +#endif if (flags & VOFLAG_FLIPPING) Flip_Flag = 1; zoomFlag = flags & VOFLAG_SWSCALE; - int_pause = 0; // 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