Skip to content

V
vlc
Commit 1efd95b7 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

backport [17046]

parent b0e3f34f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
modules/gui/macosx/vout.m
View file @ 1efd95b7
...@@ -692,7 +692,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -692,7 +692,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
else else
{ {
if ( VLCIntf && !(p_vout->b_fullscreen) && if ( VLCIntf && !(p_vout->b_fullscreen) &&
!(var_GetBool( p_real_vout, "macosx-background" )) && !(var_GetBool( p_vout, "macosx-background" )) &&
var_GetBool( p_vout, "macosx-embedded") ) var_GetBool( p_vout, "macosx-embedded") )
{ {
o_return = [[[VLCMain sharedInstance] getEmbeddedList] o_return = [[[VLCMain sharedInstance] getEmbeddedList]
...@@ -913,8 +913,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -913,8 +913,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
b_init_ok = VLC_FALSE; b_init_ok = VLC_FALSE;
p_real_vout = [VLCVoutView getRealVout: p_vout]; p_real_vout = [VLCVoutView getRealVout: p_vout];
i_device = var_GetInteger( p_real_vout->p_vlc, "video-device" ); i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" );
b_black = var_GetBool( p_real_vout->p_vlc, "macosx-black" ); b_black = var_GetBool( p_vout, "macosx-black" );
/* Find out on which screen to open the window */ /* Find out on which screen to open the window */
if( i_device <= 0 || i_device > (int)[o_screens count] ) if( i_device <= 0 || i_device > (int)[o_screens count] )
...@@ -944,7 +944,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -944,7 +944,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
backing: NSBackingStoreBuffered backing: NSBackingStoreBuffered
defer: YES screen: o_screen]; defer: YES screen: o_screen];
if( var_GetBool( p_real_vout, "macosx-black" ) )
if( b_black == VLC_TRUE ) if( b_black == VLC_TRUE )
{ {
CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
...@@ -993,7 +992,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -993,7 +992,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
CGReleaseDisplayFadeReservation( token); CGReleaseDisplayFadeReservation( token);
} }
} }
else if( var_GetBool( p_real_vout, "macosx-background" ) ) else if( var_GetBool( p_vout, "macosx-background" ) )
{ {
NSRect screen_rect = [o_screen frame]; NSRect screen_rect = [o_screen frame];
screen_rect.origin.x = screen_rect.origin.y = 0; screen_rect.origin.x = screen_rect.origin.y = 0;
......
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