/*****************************************************************************
* embeddedwindow.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2005-2006 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
[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];
/* 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_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
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];
[o_btn_fullscreen setState: YES];
[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)
* Mac OS X <10.4 which doesn't support NSAnimation, instead we
* simply fade the display */
CGDisplayFadeReservationToken token;
-
+
[o_fullscreen_window setFrame:screen_rect display:NO];
-
+
CGAcquireDisplayFadeReservation(kCGMaxDisplayReservationInterval, &token);
CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
-
+
if ([screen isMainScreen])
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
-
+
[[self contentView] replaceSubview:o_view with:o_temp_view];
[o_temp_view setFrame:[o_view frame]];
[o_fullscreen_window setContentView:o_view];
return;
}
-
+
/* Make sure we don't see the o_view disappearing of the screen during this operation */
DisableScreenUpdates();
[[self contentView] replaceSubview:o_view with:o_temp_view];
{
/* We were already fullscreen nothing to do when NSAnimation
* is not supported */
- b_animation_lock_alreadylocked = NO;
[self unlockFullscreenAnimation];
return;
}
{
/* Make sure we are hidden */
[super orderOut: self];
- b_animation_lock_alreadylocked = NO;
[self unlockFullscreenAnimation];
return;
}
[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);
/* tell the fspanel to move itself to front next time it's triggered */
[[[[VLCMain sharedInstance] getControls] getFSPanel] setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]];
-
+
[super orderOut: self];
[[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
/* Don't do anything if o_fullscreen_window is already closed */
if (!o_fullscreen_window)
{
- b_animation_lock_alreadylocked = NO;
[self unlockFullscreenAnimation];
return;
}
[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.x += [self frame].origin.x;
frame.origin.y += [self frame].origin.y;
dict2 = [[NSMutableDictionary alloc] initWithCapacity:2];
[o_fullscreen_window release];
o_fullscreen_window = nil;
- b_animation_lock_alreadylocked = NO;
[self unlockFullscreenAnimation];
}
- (void)orderOut: (id)sender
{
[super orderOut: sender];
+
/* Make sure we leave fullscreen */
[self leaveFullscreenAndFadeOut: YES];
}
projects / vlc / blobdiff