RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 12:25:03 +00:00
Code Issues Releases Wiki Activity

fix device_id option after r28165

Browse Source 
patch by Adrian Stutz %adrian A sttz P ch%
Original thread:
date     Fri, Jan 9, 2009 at 4:03 PM
subject  [MPlayer-dev-eng] [PATCH] vo_macosx: fix device_id option after r28165


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28341 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
gpoirier 2009-01-18 18:05:16 +00:00
parent cc52547ece
commit 39cb032fd1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DOCS/man/en/mplayer.1
View File

@ -3560,7 +3560,8 @@ Mac OS X CoreVideo video output driver
.PD 0
.RSs
.IPs device_id=<number>
Choose the display device to use in fullscreen.
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
Write output to a shared memory buffer instead of displaying it and
try to open an existing NSConnection for communication with a GUI.

13
libvo/vo_macosx.m
View File

@ -49,8 +49,7 @@ BOOL shared_buffer = false;
static char *buffer_name;
//Screen
int screen_id;
BOOL screen_force;
int screen_id = -1;
NSRect screen_frame;
NSScreen *screen_handle;
NSArray *screen_array;
@ -111,13 +110,13 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
screen_array = [NSScreen screens];
if(screen_id < [screen_array count])
{
screen_handle = [screen_array objectAtIndex:screen_id];
screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)];
}
else
{
mp_msg(MSGT_VO, MSGL_FATAL, "Get device error: Device ID %d do not exist, falling back to main device.\n", screen_id);
screen_handle = [screen_array objectAtIndex:0];
screen_id = 0;
screen_id = -1;
}
screen_frame = [screen_handle frame];
vo_screenwidth = screen_frame.size.width;
@ -325,7 +324,7 @@ static void uninit(void)
}
static opt_t subopts[] = {
{"device_id", OPT_ARG_INT, &screen_id, (opt_test_f)int_non_neg},
{"device_id", OPT_ARG_INT, &screen_id, NULL},
{"shared_buffer", OPT_ARG_BOOL, &shared_buffer, NULL},
{"buffer_name", OPT_ARG_MSTRZ,&buffer_name, NULL},
{NULL}
@ -335,7 +334,7 @@ static int preinit(const char *arg)
{
// set defaults
screen_id = 0;
screen_id = -1;
shared_buffer = false;
buffer_name = NULL;
@ -859,7 +858,7 @@ static int control(uint32_t request, void *data, ...)
}
old_frame = [window frame]; //save main window size & position
if(screen_force)
if(screen_id >= 0)
screen_frame = [screen_handle frame];
else {
screen_frame = [[window screen] frame];