[MPlayer-cvslog] CVS: main/libvo vo_xmga.c, 1.95, 1.96 vo_xv.c, 1.172, 1.173 vo_xvmc.c, 1.27, 1.28

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

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

Modified Files:
	vo_xmga.c vo_xv.c vo_xvmc.c 
Log Message:
do aspect correction of video size before calculating vo_dx and vo_dy.
fixes misplaced video e.g. with -aspect 0.3 (window is not centered but near left border)


Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- vo_xmga.c	16 Apr 2006 13:38:28 -0000	1.95
+++ vo_xmga.c	14 May 2006 19:36:21 -0000	1.96
@@ -134,6 +134,7 @@
 
     vo_panscan_x = vo_panscan_y = vo_panscan_amount = 0;
 
+    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,
@@ -171,8 +172,6 @@
 
     inited = 1;
 
-    aspect(&d_width, &d_height, A_NOZOOM);
-
 #ifdef HAVE_NEW_GUI
     if (use_gui)
         guiGetEvent(guiSetShVideo, 0);  // the GUI will set up / resize the window

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- vo_xv.c	4 May 2006 08:45:34 -0000	1.172
+++ vo_xv.c	14 May 2006 19:36:21 -0000	1.173
@@ -191,6 +191,7 @@
     visible_buf = -1;
 
     update_xinerama_info();
+    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,
@@ -234,7 +235,6 @@
     {
         hint.x = vo_dx;
         hint.y = vo_dy;
-        aspect(&d_width, &d_height, A_NOZOOM);
         hint.width = d_width;
         hint.height = d_height;
 #ifdef HAVE_XF86VM

Index: vo_xvmc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vo_xvmc.c	16 Apr 2006 13:38:28 -0000	1.27
+++ vo_xvmc.c	14 May 2006 19:36:21 -0000	1.28
@@ -605,6 +605,7 @@
    vo_mouse_autohide = 1;
 
    update_xinerama_info();
+   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);
    vo_dx += xinerama_x;
@@ -623,7 +624,6 @@
    {
       hint.x = vo_dx;
       hint.y = vo_dy;
-      aspect(&d_width,&d_height,A_NOZOOM);
       hint.width = d_width;
       hint.height = d_height;
 #ifdef HAVE_XF86VM