[vlc-commits] macosx intf/vout: respond correctly to VOUT_DISPLAY_CHANGE_FULLSCREEN ( close #6464)

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Mar 25 22:57:39 2012 +0200| [32304937c07e54cf8ba9e7700ee21774e67567dc] | committer: Felix Paul Kühne

macosx intf/vout: respond correctly to VOUT_DISPLAY_CHANGE_FULLSCREEN (close #6464)
(cherry picked from commit 7515422f601011a2295b928fdf39f8af7376de2b)

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

 modules/gui/macosx/MainWindow.h |    2 ++
 modules/gui/macosx/MainWindow.m |   15 +++++++++++++++
 modules/video_output/macosx.m   |    2 +-
 3 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index 9578b24..7839551 100644
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -183,6 +183,7 @@
 /* fullscreen handling */
 - (void)showFullscreenController;
 - (BOOL)isFullscreen;
+- (void)updateFullscreen;
 - (void)lockFullscreenAnimation;
 - (void)unlockFullscreenAnimation;
 - (void)enterFullscreen;
@@ -204,6 +205,7 @@
 }
 
 - (BOOL)isFullscreen;
+- (void)updateFullscreen;
 - (void)customZoom:(id)sender;
 
 @end
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index e8eacb7..98128a9 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1511,6 +1511,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
         [o_fspanel fadeIn];
 }
 
+- (void)updateFullscreen
+{
+    [[VLCMain sharedInstance] fullscreenChanged];
+}
+
 - (BOOL)isFullscreen
 {
     return b_fullscreen;
@@ -2240,6 +2245,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
     }
 }
 
+- (IBAction)fullscreen:(id)sender
+{
+    [[VLCCoreInteraction sharedInstance] toggleFullscreen];
+}
+
+- (void)updateFullscreen
+{
+    [[VLCMain sharedInstance] fullscreenChanged];
+}
+
 - (BOOL)isFullscreen
 {
     return [[VLCMainWindow sharedInstance] isFullscreen];
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index b41afa7..576ed7f 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -315,7 +315,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         case VOUT_DISPLAY_CHANGE_FULLSCREEN:
         {
             NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-            [[sys->glView window] performSelectorOnMainThread:@selector(fullscreen:) withObject: nil waitUntilDone:NO];
+            [[sys->glView window] performSelectorOnMainThread:@selector(updateFullscreen) withObject: nil waitUntilDone:NO];
             [o_pool release];
             return VLC_SUCCESS;
         }