From 8c94b3ddd0ddb5e91f8c2ee0996489fb14abbf70 Mon Sep 17 00:00:00 2001 From: arpi_esp Date: Sun, 20 May 2001 21:49:45 +0000 Subject: [PATCH] didn't handle flags parameter correctly git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@845 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_xmga.c | 6 +++--- libvo/vo_xv.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index a069b34dff..6a60cf29f5 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -245,7 +245,7 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ #ifdef HAVE_GUI mdwidth=d_width; mdheight=d_height; #endif - mFullscreen=fullscreen; + mFullscreen=fullscreen&1; switch ( vo_depthonscreen ) { @@ -260,7 +260,7 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ if ( vo_window == None ) { #endif - if ( fullscreen ) + if ( mFullscreen ) { wndWidth=vo_screenwidth; wndHeight=vo_screenheight; @@ -285,7 +285,7 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ vinfo.visual,xswamask,&xWAttribs ); vo_hidecursor(mDisplay,mWindow); - if ( fullscreen ) vo_x11_decoration( mDisplay,mWindow,0 ); + if ( mFullscreen ) vo_x11_decoration( mDisplay,mWindow,0 ); XGetNormalHints( mDisplay,mWindow,&hint ); hint.x=wndX; hint.y=wndY; diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 82d727cef5..0f1df47de4 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -93,7 +93,7 @@ static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen; * connect to server, create and map window, * allocate colors and (shared) memory */ -static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) +static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { int screen; char *hello = (title == NULL) ? "Xv render" : title; @@ -110,7 +110,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t image_width = width; image_format=format; - mFullscreen=fullscreen; + mFullscreen=flags&1; dwidth=d_width; dheight=d_height; if(getenv("DISPLAY")) name = getenv("DISPLAY"); @@ -133,7 +133,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t hint.y = 0; hint.width = d_width; hint.height = d_height; - if ( fullscreen ) + if ( mFullscreen ) { hint.width=vo_screenwidth; hint.height=vo_screenheight; @@ -155,7 +155,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t XSelectInput(mydisplay, mywindow, StructureNotifyMask | KeyPressMask ); XSetStandardProperties(mydisplay, mywindow, hello, hello, None, NULL, 0, &hint); - if ( fullscreen ) vo_x11_decoration( mydisplay,mywindow,0 ); + if ( mFullscreen ) vo_x11_decoration( mydisplay,mywindow,0 ); XMapWindow(mydisplay, mywindow); XFlush(mydisplay); XSync(mydisplay, False);