macosx: fail the video output if Quartz Extreme isn't supported, removed specific...

[vlc] / modules / gui / macosx / vout.m

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index df9b41f6df83daeb844e71341a4d83bac031477f..22b5cbd602e54bc7a6c67e0b0837c71fd4ad4c8b 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -32,7 +32,6 @@
 #import <string.h>
 
 #import "intf.h"
-#import "fspanel.h"
 #import "vout.h"
 #import "CoreInteraction.h"
 #import "MainMenu.h"
@@ -152,19 +151,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     [o_view setFrameSize: [self frame].size];
 }
 
-- (void)drawRect:(NSRect)rect
-{
-    /* When there is no subview we draw a black background */
-    [self lockFocus];
-    [[NSColor blackColor] set];
-    NSRectFill(rect);
-    [self unlockFocus];
-}
-
 - (void)closeVout
 {
     /* Make sure we don't see a white flash */
-    [[o_view window] disableScreenUpdatesUntilFlush];
     [o_view removeFromSuperview];
     [o_view release];
     o_view = nil;
@@ -377,9 +366,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
         {
             var_SetCoords( p_vout, "mouse-moved", ((int)ml.x), ((int)ml.y) );
         }
-//        if( var_GetBool( p_vout, "fullscreen") )
-            [[[VLCMainWindow sharedInstance] fspanel] fadeIn];
         vlc_object_release( p_vout );
+        [[VLCMain sharedInstance] showFullscreenController];
     }
 
     [super mouseMoved: o_event];