[Mplayer-cvslog] CVS: main/libvo vo_xv.c,1.141,1.142

[Attila Kinali CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv19006/libvo

Modified Files:
	vo_xv.c 
Log Message:
Patch by Tom Lees <tal26 (at) cam.ac.uk>

This patch fixes two minor problems the vo_xv driver has:

1. Starting in fullscreen e.g. (mplayer -fs dvd://1) will have a window
which doesn't extend all the way down the screen unless you have a 4:3
movie.

2. Monitoraspect is not used so e.g. showing a movie when in 1280x1024
desktop looks wrong.

BTW: maybe vo_xv.c should be reindented. it's getting more and more
unreadable


Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- vo_xv.c	13 Jun 2003 01:25:11 -0000	1.141
+++ vo_xv.c	22 Jun 2003 10:09:04 -0000	1.142
@@ -307,9 +307,9 @@
   {
    hint.x = vo_dx;
    hint.y = vo_dy;
+   aspect(&d_width,&d_height,A_NOZOOM);
    hint.width = d_width;
    hint.height = d_height;
-   aspect(&d_width,&d_height,A_NOZOOM);
 #ifdef HAVE_XF86VM
     if ( vm )
       {
@@ -379,10 +379,12 @@
         XSetWMNormalHints( mDisplay,vo_window,&hint );
 	XMapWindow(mDisplay, vo_window);
 	if ( flags&1 ) vo_x11_fullscreen();
+	else {
 #ifdef HAVE_XINERAMA
-	vo_x11_xinerama_move(mDisplay,vo_window);
+	    vo_x11_xinerama_move(mDisplay,vo_window);
 #endif
-	vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
+		vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
+	}
     } else  {
 	// vo_fs set means we were already at fullscreen
 	vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );