[vlc-commits] macosx: fixed fullscreen toggle through the http interface and friends ( fixes #5349)

Felix Paul Kühne git at videolan.org
Fri Dec 23 02:04:12 CET 2011


vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Dec 22 19:28:16 2011 +0100| [03bef90f1d9e759c45fe91cd6d476f8d5ca13b8e] | committer: Jean-Baptiste Kempf

macosx: fixed fullscreen toggle through the http interface and friends (fixes #5349)
(cherry picked from commit 2552b92a99b3834b5be92837db256ee248a0403e)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/macosx/intf.m     |    6 +++++-
 modules/video_output/macosx.m |    6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 2f4f6bc..91d061e 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -166,7 +166,11 @@ static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args )
         [[VLCMain sharedInstance] setNativeVideoSize:NSMakeSize( i_width, i_height )];
     }
     else if( i_query == VOUT_WINDOW_SET_FULLSCREEN )
-        msg_Dbg( p_wnd, "WindowControl:VOUT_WINDOW_SET_FULLSCREEN" );
+    {
+        NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+        [[VLCMain sharedInstance] fullscreenChanged];
+        [o_pool release];
+    }
     else
         msg_Dbg( p_wnd, "WindowControl: unknown query" );
     return VLC_SUCCESS;
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 17f697d..c2e85b5 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -311,8 +311,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
     {
         case VOUT_DISPLAY_CHANGE_FULLSCREEN:
         {
-            /* todo */
-            return VLC_EGENERIC;
+            NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+            [[sys->glView window] performSelectorOnMainThread:@selector(fullscreen:) withObject: nil waitUntilDone:NO];
+            [o_pool release];
+            return VLC_SUCCESS;
         }
         case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
         {



More information about the vlc-commits mailing list