changeset 35071:e31eb09c681d

Use xinerama_x/xinerama_y.
author reimar
date Tue, 11 Sep 2012 20:11:34 +0000
parents ff4758e8cfba
children 5d9e4777593b
files libvo/vo_corevideo.m
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_corevideo.m	Tue Sep 11 20:03:52 2012 +0000
+++ b/libvo/vo_corevideo.m	Tue Sep 11 20:11:34 2012 +0000
@@ -138,7 +138,8 @@
 	screen_frame = [screen_handle frame];
 	vo_screenwidth = screen_frame.size.width;
 	vo_screenheight = screen_frame.size.height;
-	xinerama_x = xinerama_y = 0;
+	xinerama_x = screen_frame.origin.x;
+	xinerama_y = screen_frame.origin.y;
 	aspect_save_screenres(vo_screenwidth, vo_screenheight);
 }
 
@@ -525,7 +526,6 @@
 
 - (void) config
 {
-	NSRect visibleFrame;
 	CVReturn error = kCVReturnSuccess;
 
 	//config window
@@ -537,10 +537,9 @@
 	// not aware of it.
 	// Also flip vo_dy since the screen origin is in the bottom left on OSX.
 	update_screen_info();
-	visibleFrame = [screen_handle frame];
 	[window setFrameTopLeftPoint:NSMakePoint(
-		visibleFrame.origin.x + vo_dx,
-		visibleFrame.origin.y + visibleFrame.size.height - vo_dy)];
+		vo_dx,
+		2*xinerama_y + vo_screenheight - vo_dy)];
 
 	[self releaseVideoSpecific];
 	error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[0], image_stride, NULL, NULL, NULL, &frameBuffers[0]);