[MPlayer-cvslog] CVS: main/libvo vo_gl.c, 1.69, 1.70 vo_gl2.c, 1.64, 1.65 w32_common.c, 1.9, 1.10

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv7663/libvo

Modified Files:
	vo_gl.c vo_gl2.c w32_common.c 
Log Message:
-geometry support for gl2 under win, default window pos centered for gl, gl2


Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- vo_gl.c	29 May 2005 17:04:51 -0000	1.69
+++ vo_gl.c	30 May 2005 08:45:21 -0000	1.70
@@ -162,6 +162,8 @@
 	aspect_save_screenres(vo_screenwidth,vo_screenheight);
 
 	aspect(&d_width,&d_height,A_NOZOOM);
+	vo_dx = (vo_screenwidth - d_width) / 2;
+	vo_dy = (vo_screenheight - d_height) / 2;
 	geometry(&vo_dx, &vo_dy, &d_width, &d_height,
 	          vo_screenwidth, vo_screenheight);
 #ifdef X11_FULLSCREEN

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- vo_gl2.c	29 May 2005 17:04:51 -0000	1.64
+++ vo_gl2.c	30 May 2005 08:45:21 -0000	1.65
@@ -829,6 +829,8 @@
 	aspect_save_screenres(vo_screenwidth,vo_screenheight);
 
 	aspect(&d_width,&d_height,A_NOZOOM);
+	vo_dx = (vo_screenwidth - d_width) / 2;
+	vo_dy = (vo_screenheight - d_height) / 2;
 	geometry(&vo_dx, &vo_dy, &d_width, &d_height,
 	          vo_screenwidth, vo_screenheight);
 

Index: w32_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/w32_common.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- w32_common.c	21 Feb 2005 14:44:39 -0000	1.9
+++ w32_common.c	30 May 2005 08:45:21 -0000	1.10
@@ -180,7 +180,7 @@
     updateScreenProperties();
     vo_dwidth = vo_fs ? vo_screenwidth : o_dwidth;
     vo_dheight = vo_fs ? vo_screenheight : o_dheight;
-    SetWindowPos(vo_window, layer, (vo_screenwidth - vo_dwidth) / 2, (vo_screenheight - vo_dheight) / 2, vo_dwidth, vo_dheight, SWP_SHOWWINDOW);
+    SetWindowPos(vo_window, layer, vo_dx, vo_dy, vo_dwidth, vo_dheight, SWP_SHOWWINDOW);
 
     PIXELFORMATDESCRIPTOR pfd;
     memset(&pfd, 0, sizeof pfd);