[vlc-commits] macosx: remove recursive lock from fullscreen animation

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Wed Jun  5 11:53:22 2013 +0200| [d856bd93faa73baf46101aa2e31758a54ac952c6] | committer: David Fuhrmann

macosx: remove recursive lock from fullscreen animation

This code is needless and had no effect for the last five years, already.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d856bd93faa73baf46101aa2e31758a54ac952c6
---

 modules/gui/macosx/Windows.h |    1 -
 modules/gui/macosx/Windows.m |   24 +++---------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/modules/gui/macosx/Windows.h b/modules/gui/macosx/Windows.h
index c8dbfea..5a9a053 100644
--- a/modules/gui/macosx/Windows.h
+++ b/modules/gui/macosx/Windows.h
@@ -103,7 +103,6 @@ static const float f_min_video_height = 70.0;
     NSView          * o_temp_view;
 
     BOOL              b_window_is_invisible;
-    NSRecursiveLock * o_animation_lock;
     NSInteger i_originalLevel;
 
     NSTimer *t_hide_mouse_timer;
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index af7e65b..a9eb6b4 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -686,7 +686,7 @@
 
     [NSCursor setHiddenUntilMouseMoves: NO];
     [[[VLCMainWindow sharedInstance] fsPanel] setNonActive: nil];
-    
+
     [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: i_originalLevel];
     [self setLevel:i_originalLevel];
 
@@ -715,23 +715,13 @@
     if (![o_video_view isHidden]) {
         [[o_controls_bar bottomBarView] setHidden: NO];
     }
-    
+
     [self setMovableByWindowBackground: YES];
 }
 
 #pragma mark -
 #pragma mark Fullscreen Logic
 
-- (void)lockFullscreenAnimation
-{
-    [o_animation_lock lock];
-}
-
-- (void)unlockFullscreenAnimation
-{
-    [o_animation_lock unlock];
-}
-
 - (void)enterFullscreen
 {
     NSMutableDictionary *dict1, *dict2;
@@ -741,7 +731,6 @@
     BOOL blackout_other_displays = var_InheritBool(VLCIntf, "macosx-black");
 
     screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)var_InheritInteger(VLCIntf, "macosx-vdev")];
-    [self lockFullscreenAnimation];
 
     if (!screen) {
         msg_Dbg(VLCIntf, "chosen screen isn't present, using current screen for fullscreen mode");
@@ -830,7 +819,6 @@
         /* Make sure we are hidden */
         [self orderOut: self];
 
-        [self unlockFullscreenAnimation];
         return;
     }
 
@@ -895,7 +883,6 @@
         [self orderOut: self];
 
     [self setFullscreen:YES];
-    [self unlockFullscreenAnimation];
 }
 
 - (void)leaveFullscreen
@@ -909,8 +896,6 @@
     NSRect frame;
     BOOL blackout_other_displays = var_InheritBool(VLCIntf, "macosx-black");
 
-    [self lockFullscreenAnimation];
-
     if (o_controls_bar)
         [o_controls_bar setFullscreenState:NO];
     [[[VLCMainWindow sharedInstance] controlsBar] setFullscreenState:NO];
@@ -922,7 +907,6 @@
 
     /* Don't do anything if o_fullscreen_window is already closed */
     if (!o_fullscreen_window) {
-        [self unlockFullscreenAnimation];
         return;
     }
 
@@ -1030,7 +1014,7 @@
 
     [o_fullscreen_window release];
     o_fullscreen_window = nil;
-    
+
     [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: i_originalLevel];
     [self setLevel:i_originalLevel];
     [self setAlphaValue: config_GetFloat(VLCIntf, "macosx-opaqueness")];
@@ -1038,8 +1022,6 @@
     // 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])
         [self orderOut: self];
-
-    [self unlockFullscreenAnimation];
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation