Commit 88a67f9e authored by David Fuhrmann's avatar David Fuhrmann

macosx vout: also do crop if macosx-video-autoresize is false

(cherry picked from commit bb20070a980134c728d5d57c9203784006f5a82c)
Signed-off-by: default avatarDavid Fuhrmann <david.fuhrmann@googlemail.com>
parent 313cdcec
...@@ -340,9 +340,6 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -340,9 +340,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
if (!vd->sys) if (!vd->sys)
return VLC_EGENERIC; return VLC_EGENERIC;
if (!config_GetInt( vd, "macosx-video-autoresize" ))
return VLC_SUCCESS;
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
NSPoint topleftbase; NSPoint topleftbase;
NSPoint topleftscreen; NSPoint topleftscreen;
...@@ -421,7 +418,8 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -421,7 +418,8 @@ static int Control (vout_display_t *vd, int query, va_list ap)
// is needed in the case we do not an actual resize // is needed in the case we do not an actual resize
[sys->glView performSelectorOnMainThread:@selector(reshapeView:) withObject:nil waitUntilDone:NO]; [sys->glView performSelectorOnMainThread:@selector(reshapeView:) withObject:nil waitUntilDone:NO];
if( i_height != glViewFrame.size.height || i_width != glViewFrame.size.width ) if (config_GetInt (vd, "macosx-video-autoresize") && query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE &&
(i_height != glViewFrame.size.height || i_width != glViewFrame.size.width))
{ {
new_frame.size.width = windowFrame.size.width - glViewFrame.size.width + i_width; new_frame.size.width = windowFrame.size.width - glViewFrame.size.width + i_width;
new_frame.size.height = windowFrame.size.height - glViewFrame.size.height + i_height; new_frame.size.height = windowFrame.size.height - glViewFrame.size.height + i_height;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment