[patch] mplayer-xinerama.patch

mplayer-xinerama.patch (text/plain), 1.70 KB, created by Bernd Steinhauser on 2007-08-01 13:43:45 UTC

--- libvo/aspect.c	2007/07/28 22:21:29	23895
+++ libvo/aspect.c	2007/07/28 22:42:20	23896
@@ -19,6 +19,7 @@
 
 #include "video_out.h"
 
+float force_monitor_aspect=0;
 float monitor_aspect=0;
 float monitor_pixel_aspect=1;
 extern float movie_aspect;
@@ -55,7 +56,9 @@
 #endif
   aspdat.scrw = scrw;
   aspdat.scrh = scrh;
-  if (!monitor_aspect)
+  if (force_monitor_aspect)
+    monitor_aspect = force_monitor_aspect;
+  else
     monitor_aspect = monitor_pixel_aspect * scrw / scrh;
 }
	
--- cfg-mplayer.h	2007/07/28 22:21:29	23895
+++ cfg-mplayer.h	2007/07/28 22:42:20	23896
@@ -99,7 +99,7 @@
 #endif
 
 /* from libvo/aspect.c */
-extern float monitor_aspect;
+extern float force_monitor_aspect;
 extern float monitor_pixel_aspect;
 
 extern int sws_flags;
@@ -213,7 +213,7 @@
 	// Geometry string
 	{"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	// set aspect ratio of monitor - useful for 16:9 TVout
-	{"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL},
+	{"monitoraspect", &force_monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9.0, NULL},
 	{"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL},
 	// video mode switching: (x11,xv,dga)
         {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL},
--- libvo/x11_common.c	2007/07/22 18:31:17	23843
+++ libvo/x11_common.c	2007/07/28 22:21:29	23895
@@ -1533,12 +1533,12 @@
             vo_old_y = vo_dy;
             vo_old_width = vo_dwidth;
             vo_old_height = vo_dheight;
+        }
             update_xinerama_info();
             x = xinerama_x;
             y = xinerama_y;
             w = vo_screenwidth;
             h = vo_screenheight;
-        }
     }
     {
         long dummy;