Mercurial > mplayer.hg
changeset 35074:3fb18ad99003
Deprecate corevideo device_id in favour of -xineramascreen.
It should still work unchanged except for corner-cases with
per-file -xineramascreen settings.
| author | reimar |
|---|---|
| date | Tue, 11 Sep 2012 21:31:21 +0000 |
| parents | cae3fc699368 |
| children | c40203dd82b7 |
| files | DOCS/man/en/mplayer.1 libvo/vo_corevideo.m |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Tue Sep 11 21:23:00 2012 +0000 +++ b/DOCS/man/en/mplayer.1 Tue Sep 11 21:31:21 2012 +0000 @@ -4040,6 +4040,7 @@ .PD 0 .RSs .IPs device_id=<number> +DEPRECATED, use \-xineramascreen instead. Choose the display device to use for fullscreen or set it to \-1 to always use the same screen the video window is on (default: \-1 \- auto). .IPs shared_buffer
--- a/libvo/vo_corevideo.m Tue Sep 11 21:23:00 2012 +0000 +++ b/libvo/vo_corevideo.m Tue Sep 11 21:31:21 2012 +0000 @@ -118,11 +118,10 @@ 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 @@ "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 @@ autoreleasepool = [[NSAutoreleasePool alloc] init]; + if (screen_id != -1) + xinerama_screen = screen_id; + if (!buffer_name) buffer_name = strdup(DEFAULT_BUFFER_NAME); else