[MPlayer-cvslog] CVS: main/vidix/drivers nvidia_vid.c,1.22,1.23

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main/vidix/drivers
In directory mail:/var2/tmp/cvs-serv4084

Modified Files:
	nvidia_vid.c 
Log Message:
fix window position adjustment

Index: nvidia_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/nvidia_vid.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nvidia_vid.c	1 Feb 2004 11:35:28 -0000	1.22
+++ nvidia_vid.c	3 Sep 2005 08:48:59 -0000	1.23
@@ -506,7 +506,7 @@
 void rivatv_overlay_start (struct rivatv_info *info,int bufno){
     uint32_t base, size, offset, xscale, yscale, pan;
     uint32_t value;
-	int x=info->wx?info->wx:8, y=info->wy?info->wy:8;
+	int x=info->wx, y=info->wy;
 	int lwidth=info->d_width, lheight=info->d_height;
 	int bps;
 	int i;
@@ -547,6 +547,10 @@
 	x = info->wx - (pan % bps) * 8 / info->depth;
     	y = info->wy - (pan / bps);
 	}
+    } else {
+            // we can't adjust the window position correctly in textmode
+            // setting y to 8 seems to work ok, though
+            if(!y)y = info->wy+8;
     }
     
 	    /* adjust negative output window variables */