Fix MacOS X black screens and play as background options. These are 'window level...

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 36128e8784d64307b676d1426473c2af3582fd99..510bb1b5a59a2d722a1a9dd8726c4470b259beed 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -699,7 +699,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
         else
         {
             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") )
             {
                 o_return = [[[VLCMain sharedInstance] getEmbeddedList]
@@ -921,7 +921,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
     p_real_vout = [VLCVoutView getRealVout: p_vout];
     i_device = var_GetInteger( p_real_vout->p_libvlc, "video-device" );
-    b_black = var_GetBool( p_real_vout->p_libvlc, "macosx-black" );
+    b_black = var_GetBool( p_vout, "macosx-black" );
 
     /* Find out on which screen to open the window */
     if( i_device <= 0 || i_device > (int)[o_screens count] )
@@ -951,7 +951,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
               backing: NSBackingStoreBuffered
               defer: YES screen: o_screen];
         
-        if( var_GetBool( p_real_vout, "macosx-black" ) )
         if( b_black == VLC_TRUE )
         {
             CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
@@ -1000,7 +999,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
             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];
         screen_rect.origin.x = screen_rect.origin.y = 0;