Mac OS X gui: Use a recursive lock to be able to trigger enter/leaveFullscreen in...

diff --git a/modules/gui/macosx/embeddedwindow.h b/modules/gui/macosx/embeddedwindow.h
index 0a114c910bcfe598e87ea2ea487baf614f4c76e8..e541fa2ca8a0f74db904f89e96a816429473056f 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.h
+++ b/modules/gui/macosx/embeddedwindow.h
@@ -50,7 +50,8 @@
     NSView          * o_temp_view;
     /* set to yes if we are fullscreen and all animations are over */
     BOOL              b_fullscreen;
-    NSLock          * o_animation_lock;
+    BOOL              b_animation_lock_alreadylocked;
+    NSRecursiveLock * o_animation_lock;
 }
 
 - (void)setTime:(NSString *)o_arg_ime position:(float)f_position;

diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 232ce2aec30c2ec99645fb51634488b5ed9770bd..5c34e1080b5e4ef09e0072c7dc5843609e682216 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -67,7 +67,11 @@
     /* Not fullscreen when we wake up */
     [o_btn_fullscreen setState: NO];
     b_fullscreen = NO;
-    o_animation_lock = [[NSLock alloc] init];
+    /* 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)setTime:(NSString *)o_arg_time position:(float)f_position
@@ -170,6 +174,13 @@
     
     [self lockFullscreenAnimation];
 
+    /* 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)
         screen = [self screen];
 
@@ -238,6 +249,7 @@
         /* We were already fullscreen nothing to do when NSAnimation
          * is not supported */
         [self unlockFullscreenAnimation];
+        b_animation_lock_alreadylocked = NO;
         return;
     }
 
@@ -245,6 +257,7 @@
     if (b_fullscreen)
     {
         [self unlockFullscreenAnimation];
+        b_animation_lock_alreadylocked = NO;
         return;
     }
 
@@ -318,6 +331,13 @@
 
     [self lockFullscreenAnimation];
 
+    /* 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;
+
     b_fullscreen = NO;
     [o_btn_fullscreen setState: NO];
 
@@ -327,7 +347,8 @@
     /* Don't do anything if o_fullscreen_window is already closed */
     if (!o_fullscreen_window)
     {
-        [self lockFullscreenAnimation];
+        [self unlockFullscreenAnimation];
+        b_animation_lock_alreadylocked = NO;
         return;
     }
 
@@ -418,6 +439,7 @@
     [o_fullscreen_window release];
     o_fullscreen_window = nil;
     [self unlockFullscreenAnimation];
+    b_animation_lock_alreadylocked = NO;
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 0b1a347ad4dfde49f638351d666abd7c5dee82c7..d5aa8ab310fb9f92aa3b4d3804e6d50ce25d43b5 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -926,10 +926,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     
     if( b_return )
     {
+        [o_window lockFullscreenAnimation];
+
         [o_window setAlphaValue: var_GetFloat( p_vout, "macosx-opaqueness" )];
-        [self updateTitle];
 
-        [o_window lockFullscreenAnimation];
+        [self updateTitle];
 
         /* Make the window the front and key window before animating */
         if ([o_window isVisible] && (![o_window isFullscreen]))