macosx: Fix a typo. (Fix sd listing at startup).

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

diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 9c90c61b7746cea1cdeccad1314d916ce1d62ff5..582f8ac7c9d6d4c19287f6e57524049c25b29255 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
@@ -51,9 +52,12 @@
     [o_slider setToolTip: _NS("Position")];
 
     o_img_play = [NSImage imageNamed: @"play_embedded"];
-    o_img_play_pressed = [NSImage imageNamed: @"play_embedded_blue"];
     o_img_pause = [NSImage imageNamed: @"pause_embedded"];
-    o_img_pause_pressed = [NSImage imageNamed: @"pause_embedded_blue"];
+    [self controlTintChanged];
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector( controlTintChanged )
+                                                 name: NSControlTintDidChangeNotification
+                                               object: nil];
 
     /* Useful to save o_view frame in fullscreen mode */
     o_temp_view = [[NSView alloc] init];
@@ -72,6 +76,46 @@
     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_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]];
+    }
+    else
+    {
+        o_img_play_pressed = [NSImage imageNamed: @"play_embedded_blue"];
+        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_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
+{
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
+    [o_img_play release];
+    [o_img_play_pressed release];
+    [o_img_pause release];
+    [o_img_pause_pressed release];
+    
+    [super dealloc];
+}
+
 - (void)setTime:(NSString *)o_arg_time position:(float)f_position
 {
     [o_time setStringValue: o_arg_time];
@@ -150,16 +194,19 @@
     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" );
-
-    screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_GetInteger( p_vout, "video-device" )];
+    BOOL blackout_other_displays = config_GetInt( VLCIntf, "macosx-black" );
 
-    vlc_object_release( p_vout );
+    screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_GetInteger( p_vout, "video-device" )]; 
  
     [self lockFullscreenAnimation];
 
     if (!screen)
+    {
+        msg_Dbg( p_vout, "chosen screen isn't present, using current screen for fullscreen mode" );
         screen = [self screen];
+    }
+    
+    vlc_object_release( p_vout );
 
     screen_rect = [screen frame];
 
@@ -167,8 +214,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)