Commit 018c77f7 authored by David Fuhrmann's avatar David Fuhrmann

macos vout: implement VOUT_DISPLAY_CHANGE_DISPLAY_FILLED as it seems to be intended

(cherry picked from commit e6820b61)
Signed-off-by: default avatarDavid Fuhrmann <david.fuhrmann@googlemail.com>
parent 7d6fc8ee
...@@ -328,10 +328,6 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -328,10 +328,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
return VLC_SUCCESS; return VLC_SUCCESS;
} }
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED: case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
{
[[sys->glView window] performSelectorOnMainThread:@selector(performZoom:) withObject: nil waitUntilDone:NO];
return VLC_SUCCESS;
}
case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_ZOOM:
case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT: case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
case VOUT_DISPLAY_CHANGE_SOURCE_CROP: case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
...@@ -676,8 +672,17 @@ static void OpenglSwap(vlc_gl_t *gl) ...@@ -676,8 +672,17 @@ static void OpenglSwap(vlc_gl_t *gl)
NSRect bounds = [self bounds]; NSRect bounds = [self bounds];
CGFloat height = bounds.size.height; CGFloat height, width;
CGFloat width = bounds.size.width; if( !vd || ( vd && vd->cfg->is_display_filled ))
{
height = bounds.size.height;
width = bounds.size.width;
}
else
{
height = vd->source.i_visible_height;
width = vd->source.i_visible_width;
}
GLint x = width, y = height; GLint x = width, y = height;
...@@ -703,7 +708,7 @@ static void OpenglSwap(vlc_gl_t *gl) ...@@ -703,7 +708,7 @@ static void OpenglSwap(vlc_gl_t *gl)
} }
if ([self lockgl]) { if ([self lockgl]) {
glViewport((width - x) / 2, (height - y) / 2, x, y); glViewport((bounds.size.width - x) / 2, (bounds.size.height - y) / 2, x, y);
@synchronized(self) { @synchronized(self) {
// This may be cleared before -drawRect is being called, // This may be cleared before -drawRect is being called,
......
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