macosx: Save current fullscreen state.

[vlc] / modules / gui / macosx / embeddedwindow.m

diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 00060545ad7bde69eaf54012559c526a15154908..d16a16b2da8568823905d1a43d777a4cc29b9a84 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * embeddedwindow.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2005-2007 the VideoLAN team
+ * Copyright (C) 2005-2008 the VideoLAN team
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,22 +69,20 @@
     /* Not fullscreen when we wake up */
     [o_btn_fullscreen setState: NO];
     b_fullscreen = NO;
-    /* Use a recursive lock to be able to trigger enter/leavefullscreen
-     * in middle of an animation, providing that the enter/leave functions
-     * are called from the same thread */
-    o_animation_lock = [[NSRecursiveLock alloc] init];
-    b_animation_lock_alreadylocked = NO;
 }
 
 - (void)controlTintChanged
 {
+    BOOL b_playing = NO;
+    if( [o_btn_play alternateImage] == o_img_play_pressed )
+        b_playing = YES;
+    
     if( [NSColor currentControlTint] == NSGraphiteControlTint )
     {
         o_img_play_pressed = [NSImage imageNamed: @"play_embedded_graphite"];
         o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_graphite"];
         [o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_graphite"]];
         [o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_graphite"]];
-        [o_btn_play setAlternateImage: o_img_play_pressed];
         [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]];
     }
     else
@@ -92,9 +91,13 @@
         o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"];
         [o_btn_backward setAlternateImage: [NSImage imageNamed: @"skip_previous_embedded_blue"]];
         [o_btn_forward setAlternateImage: [NSImage imageNamed: @"skip_forward_embedded_blue"]];
-        [o_btn_play setAlternateImage: o_img_play_pressed];
         [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_blue"]];
     }
+    
+    if( b_playing )
+        [o_btn_play setAlternateImage: o_img_play_pressed];
+    else
+        [o_btn_play setAlternateImage: o_img_pause_pressed];
 }
 
 - (void)dealloc
@@ -186,7 +189,7 @@
     NSRect screen_rect;
     NSRect rect;
     vout_thread_t *p_vout = vlc_object_find( VLCIntf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
-    BOOL blackout_other_displays = var_GetBool( p_vout, "macosx-black" );
+    BOOL blackout_other_displays = config_GetInt( VLCIntf, "macosx-black" );
 
     screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_GetInteger( p_vout, "video-device" )]; 
  
@@ -206,8 +209,8 @@
 
     [NSCursor setHiddenUntilMouseMoves: YES];
  
-    if (blackout_other_displays)
-        [screen blackoutOtherScreens]; /* We should do something like [screen blackoutOtherScreens]; */
+    if( blackout_other_displays )        
+        [screen blackoutOtherScreens];
 
     /* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */
     if (!o_fullscreen_window)
@@ -264,7 +267,6 @@
     {
         /* We were already fullscreen nothing to do when NSAnimation
          * is not supported */
-        b_animation_lock_alreadylocked = NO;
         [self unlockFullscreenAnimation];
         return;
     }
@@ -274,7 +276,6 @@
     {
         /* Make sure we are hidden */
         [super orderOut: self];
-        b_animation_lock_alreadylocked = NO;
         [self unlockFullscreenAnimation];
         return;
     }
@@ -290,13 +291,6 @@
         [o_fullscreen_anim2 release];
     }
  
-     /* This is a recursive lock. If we are already in the middle of an animation we
-     * unlock it. We don't add an extra locking here, because enter/leavefullscreen
-     * are executed always in the same thread */
-    if (b_animation_lock_alreadylocked)
-        [self unlockFullscreenAnimation];
-    b_animation_lock_alreadylocked = YES;
-
     if ([screen isMainScreen])
         SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
 
@@ -372,7 +366,6 @@
     /* Don't do anything if o_fullscreen_window is already closed */
     if (!o_fullscreen_window)
     {
-        b_animation_lock_alreadylocked = NO;
         [self unlockFullscreenAnimation];
         return;
     }
@@ -415,13 +408,6 @@
         [o_fullscreen_anim2 release];
     }
 
-    /* This is a recursive lock. If we are already in the middle of an animation we
-     * unlock it. We don't add an extra locking here, because enter/leavefullscreen
-     * are executed always in the same thread */
-    if (b_animation_lock_alreadylocked)
-        [self unlockFullscreenAnimation];
-    b_animation_lock_alreadylocked = YES;
-
     frame = [[o_temp_view superview] convertRect: [o_temp_view frame] toView: nil]; /* Convert to Window base coord */
     frame.origin.x += [self frame].origin.x;
     frame.origin.y += [self frame].origin.y;
@@ -478,7 +464,6 @@
 
     [o_fullscreen_window release];
     o_fullscreen_window = nil;
-    b_animation_lock_alreadylocked = NO;
     [self unlockFullscreenAnimation];
 }
 
@@ -507,6 +492,7 @@
 - (void)orderOut: (id)sender
 {
     [super orderOut: sender];
+
     /* Make sure we leave fullscreen */
     [self leaveFullscreenAndFadeOut: YES];
 }