/*****************************************************************************
* 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
/* 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
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" )];
[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)
{
/* 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);
/* 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.y += [self frame].origin.y;
[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];
}