Commit e053d5aa authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Use the proper parent object to do var_Get macosx-black on. Fixes the issue...

* Use the proper parent object to do var_Get macosx-black on. Fixes the issue where we failed to mutex_lock.
parent 943bf4b4
...@@ -966,7 +966,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -966,7 +966,7 @@ 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_vout, "macosx-black" ) ) if( var_GetBool( p_real_vout, "macosx-black" ) )
{ {
CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
CGDisplayFade( token, 0.5, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, true ); CGDisplayFade( token, 0.5, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, true );
...@@ -1008,7 +1008,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1008,7 +1008,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
BeginFullScreen( &p_fullscreen_state, NULL, 0, 0, BeginFullScreen( &p_fullscreen_state, NULL, 0, 0,
NULL, NULL, fullScreenAllowEvents ); NULL, NULL, fullScreenAllowEvents );
} }
if( var_GetBool( p_vout, "macosx-black" ) ) if( var_GetBool( p_real_vout, "macosx-black" ) )
{ {
CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token); CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
CGDisplayFade( token, 2 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, false ); CGDisplayFade( token, 2 , kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, false );
......
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