Commit d856bd93 authored by David Fuhrmann's avatar David Fuhrmann

macosx: remove recursive lock from fullscreen animation

This code is needless and had no effect for the last five years, already.
parent daf2eb53
...@@ -103,7 +103,6 @@ static const float f_min_video_height = 70.0; ...@@ -103,7 +103,6 @@ static const float f_min_video_height = 70.0;
NSView * o_temp_view; NSView * o_temp_view;
BOOL b_window_is_invisible; BOOL b_window_is_invisible;
NSRecursiveLock * o_animation_lock;
NSInteger i_originalLevel; NSInteger i_originalLevel;
NSTimer *t_hide_mouse_timer; NSTimer *t_hide_mouse_timer;
......
...@@ -722,16 +722,6 @@ ...@@ -722,16 +722,6 @@
#pragma mark - #pragma mark -
#pragma mark Fullscreen Logic #pragma mark Fullscreen Logic
- (void)lockFullscreenAnimation
{
[o_animation_lock lock];
}
- (void)unlockFullscreenAnimation
{
[o_animation_lock unlock];
}
- (void)enterFullscreen - (void)enterFullscreen
{ {
NSMutableDictionary *dict1, *dict2; NSMutableDictionary *dict1, *dict2;
...@@ -741,7 +731,6 @@ ...@@ -741,7 +731,6 @@
BOOL blackout_other_displays = var_InheritBool(VLCIntf, "macosx-black"); BOOL blackout_other_displays = var_InheritBool(VLCIntf, "macosx-black");
screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_InheritInteger(VLCIntf, "macosx-vdev")]; screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_InheritInteger(VLCIntf, "macosx-vdev")];
[self lockFullscreenAnimation];
if (!screen) { if (!screen) {
msg_Dbg(VLCIntf, "chosen screen isn't present, using current screen for fullscreen mode"); msg_Dbg(VLCIntf, "chosen screen isn't present, using current screen for fullscreen mode");
...@@ -830,7 +819,6 @@ ...@@ -830,7 +819,6 @@
/* Make sure we are hidden */ /* Make sure we are hidden */
[self orderOut: self]; [self orderOut: self];
[self unlockFullscreenAnimation];
return; return;
} }
...@@ -895,7 +883,6 @@ ...@@ -895,7 +883,6 @@
[self orderOut: self]; [self orderOut: self];
[self setFullscreen:YES]; [self setFullscreen:YES];
[self unlockFullscreenAnimation];
} }
- (void)leaveFullscreen - (void)leaveFullscreen
...@@ -909,8 +896,6 @@ ...@@ -909,8 +896,6 @@
NSRect frame; NSRect frame;
BOOL blackout_other_displays = var_InheritBool(VLCIntf, "macosx-black"); BOOL blackout_other_displays = var_InheritBool(VLCIntf, "macosx-black");
[self lockFullscreenAnimation];
if (o_controls_bar) if (o_controls_bar)
[o_controls_bar setFullscreenState:NO]; [o_controls_bar setFullscreenState:NO];
[[[VLCMainWindow sharedInstance] controlsBar] setFullscreenState:NO]; [[[VLCMainWindow sharedInstance] controlsBar] setFullscreenState:NO];
...@@ -922,7 +907,6 @@ ...@@ -922,7 +907,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) {
[self unlockFullscreenAnimation];
return; return;
} }
...@@ -1038,8 +1022,6 @@ ...@@ -1038,8 +1022,6 @@
// if we quit fullscreen because there is no video anymore, make sure non-embedded window is not visible // if we quit fullscreen because there is no video anymore, make sure non-embedded window is not visible
if (![[VLCMain sharedInstance] activeVideoPlayback] && [self class] != [VLCMainWindow class]) if (![[VLCMain sharedInstance] activeVideoPlayback] && [self class] != [VLCMainWindow class])
[self orderOut: self]; [self orderOut: self];
[self unlockFullscreenAnimation];
} }
- (void)animationDidEnd:(NSAnimation*)animation - (void)animationDidEnd:(NSAnimation*)animation
......
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