Commit f2f389ba authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

macosx: Remove a weird already_locked bool. (that removes a runtime warning from NSRecursiveLock.)

parent d6725429
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
NSView * o_temp_view; NSView * o_temp_view;
/* set to yes if we are fullscreen and all animations are over */ /* set to yes if we are fullscreen and all animations are over */
BOOL b_fullscreen; BOOL b_fullscreen;
BOOL b_animation_lock_alreadylocked;
NSRecursiveLock * o_animation_lock; NSRecursiveLock * o_animation_lock;
} }
......
...@@ -69,11 +69,6 @@ ...@@ -69,11 +69,6 @@
/* Not fullscreen when we wake up */ /* Not fullscreen when we wake up */
[o_btn_fullscreen setState: NO]; [o_btn_fullscreen setState: NO];
b_fullscreen = 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 - (void)controlTintChanged
...@@ -272,7 +267,6 @@ ...@@ -272,7 +267,6 @@
{ {
/* We were already fullscreen nothing to do when NSAnimation /* We were already fullscreen nothing to do when NSAnimation
* is not supported */ * is not supported */
b_animation_lock_alreadylocked = NO;
[self unlockFullscreenAnimation]; [self unlockFullscreenAnimation];
return; return;
} }
...@@ -282,7 +276,6 @@ ...@@ -282,7 +276,6 @@
{ {
/* Make sure we are hidden */ /* Make sure we are hidden */
[super orderOut: self]; [super orderOut: self];
b_animation_lock_alreadylocked = NO;
[self unlockFullscreenAnimation]; [self unlockFullscreenAnimation];
return; return;
} }
...@@ -298,13 +291,6 @@ ...@@ -298,13 +291,6 @@
[o_fullscreen_anim2 release]; [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]) if ([screen isMainScreen])
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
...@@ -380,7 +366,6 @@ ...@@ -380,7 +366,6 @@
/* Don't do anything if o_fullscreen_window is already closed */ /* Don't do anything if o_fullscreen_window is already closed */
if (!o_fullscreen_window) if (!o_fullscreen_window)
{ {
b_animation_lock_alreadylocked = NO;
[self unlockFullscreenAnimation]; [self unlockFullscreenAnimation];
return; return;
} }
...@@ -423,13 +408,6 @@ ...@@ -423,13 +408,6 @@
[o_fullscreen_anim2 release]; [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 = [[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; frame.origin.y += [self frame].origin.y;
...@@ -486,7 +464,6 @@ ...@@ -486,7 +464,6 @@
[o_fullscreen_window release]; [o_fullscreen_window release];
o_fullscreen_window = nil; o_fullscreen_window = nil;
b_animation_lock_alreadylocked = NO;
[self unlockFullscreenAnimation]; [self unlockFullscreenAnimation];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment