[MPlayer-cvslog] r35168 - in trunk: DOCS/man/en/mplayer.1 libvo/vo_corevideo.m

[reimar]

Author: reimar
Date: Tue Sep 11 23:31:21 2012
New Revision: 35168

Log:
Deprecate corevideo device_id in favour of -xineramascreen.

It should still work unchanged except for corner-cases with
per-file -xineramascreen settings.

Modified:
   trunk/libvo/vo_corevideo.m

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/libvo/vo_corevideo.m
==============================================================================
--- trunk/libvo/vo_corevideo.m	Tue Sep 11 23:23:00 2012	(r35167)
+++ trunk/libvo/vo_corevideo.m	Tue Sep 11 23:31:21 2012	(r35168)
@@ -118,11 +118,10 @@ static void draw_alpha(int x0, int y0, i
 
 static void update_screen_info(void)
 {
+	int screen_id = xinerama_screen;
 	NSArray *screen_array = [NSScreen screens];
 	NSScreen *screen_handle;
 	NSRect screen_frame;
-	if (screen_id == -1 && xinerama_screen > -1)
-		screen_id = xinerama_screen;
 
 	if(screen_id >= (int)[screen_array count])
 	{
@@ -394,6 +393,7 @@ static int preinit(const char *arg)
 				"Example: mplayer -vo corevideo:device_id=1:shared_buffer:buffer_name=mybuff\n"
 				"\nOptions:\n"
 				"  device_id=<0-...>\n"
+				"    DEPRECATED, use -xineramascreen instead.\n"
 				"    Set screen device ID for fullscreen.\n"
 				"  shared_buffer\n"
 				"    Write output to a shared memory buffer instead of displaying it.\n"
@@ -407,6 +407,9 @@ static int preinit(const char *arg)
 
 	autoreleasepool = [[NSAutoreleasePool alloc] init];
 
+	if (screen_id != -1)
+		xinerama_screen = screen_id;
+
 	if (!buffer_name)
 		buffer_name = strdup(DEFAULT_BUFFER_NAME);
 	else