[MPlayer-cvslog] r27923 - in trunk/libvo: vo_x11.c vo_xv.c x11_common.c

[reimar]

Author: reimar
Date: Sat Nov 15 19:28:35 2008
New Revision: 27923

Log:
Set modified window position and monitor aspect in vo_vm_switch instead of in
individual vos.


Modified:
   trunk/libvo/vo_x11.c
   trunk/libvo/vo_xv.c
   trunk/libvo/x11_common.c

Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c	(original)
+++ trunk/libvo/vo_x11.c	Sat Nov 15 19:28:35 2008
@@ -388,10 +388,6 @@ static int config(uint32_t width, uint32
             }
             vo_vm_switch(vm_width, vm_height, &modeline_width,
                          &modeline_height);
-            vo_dx = (vo_screenwidth - modeline_width) / 2;
-            vo_dy = (vo_screenheight - modeline_height) / 2;
-            vo_dwidth = modeline_width;
-            vo_dheight = modeline_height;
         }
 #endif
         bg = WhitePixel(mDisplay, mScreen);

Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c	(original)
+++ trunk/libvo/vo_xv.c	Sat Nov 15 19:28:35 2008
@@ -243,7 +243,6 @@ static int config(uint32_t width, uint32
             }
             vo_vm_switch(vm_width, vm_height, &modeline_width,
                          &modeline_height);
-            aspect_save_screenres(modeline_width, modeline_height);
         } else
 #endif
         XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay),

Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c	(original)
+++ trunk/libvo/x11_common.c	Sat Nov 15 19:28:35 2008
@@ -1790,9 +1790,16 @@ void vo_vm_switch(uint32_t X, uint32_t Y
         XF86VidModeLockModeSwitch(mDisplay, mScreen, 0);
         XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]);
         XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]);
+
+        // FIXME: all this is more of a hack than proper solution
         X = (vo_screenwidth - *modeline_width) / 2;
         Y = (vo_screenheight - *modeline_height) / 2;
         XF86VidModeSetViewPort(mDisplay, mScreen, X, Y);
+        vo_dx = X;
+        vo_dy = Y;
+        vo_dwidth = *modeline_width;
+        vo_dheight = *modeline_height;
+        aspect_save_screenres(*modeline_width, *modeline_height);
     }
 }