[vlc-commits] macosx: remove outdated and unused isFullscreen methods

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Jul 23 13:18:10 2012 +0200| [18dee68f3ace8adfda6e5982daa41755103f9723] | committer: David Fuhrmann

macosx: remove outdated and unused isFullscreen methods

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

 modules/gui/macosx/MainWindow.h |    1 -
 modules/gui/macosx/MainWindow.m |    6 ------
 modules/gui/macosx/VideoView.m  |    2 +-
 modules/gui/macosx/misc.h       |    4 ----
 modules/gui/macosx/misc.m       |   11 -----------
 modules/video_output/macosx.m   |    4 ----
 6 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index 89330ac..55239d8 100644
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -217,7 +217,6 @@
     NSRect previousSavedFrame;
 }
 
-- (BOOL)isFullscreen;
 - (void)customZoom:(id)sender;
 
 @end
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 72bb57d..d1efa66 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -2031,7 +2031,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
         rect.origin.x += [o_videoWindow frame].origin.x;
         rect.origin.y += [o_videoWindow frame].origin.y;
         o_fullscreen_window = [[VLCWindow alloc] initWithContentRect:rect styleMask: NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
-        [o_fullscreen_window setFullscreen: YES];
         [o_fullscreen_window setBackgroundColor: [NSColor blackColor]];
         [o_fullscreen_window setCanBecomeKeyWindow: YES];
         [o_fullscreen_window setCanBecomeMainWindow: YES];
@@ -2902,11 +2901,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [[VLCCoreInteraction sharedInstance] toggleFullscreen];
 }
 
-- (BOOL)isFullscreen
-{
-    return [[VLCMainWindow sharedInstance] isFullscreen];
-}
-
 - (void)performClose:(id)sender
 {
     if (b_dark_interface || !b_video_deco)
diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VideoView.m
index 445f224..d12f019 100644
--- a/modules/gui/macosx/VideoView.m
+++ b/modules/gui/macosx/VideoView.m
@@ -151,7 +151,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
         if( key == (unichar) 0x1b )
         {
             playlist_t * p_playlist = pl_Get( VLCIntf );
-             if( var_GetBool( p_playlist, "fullscreen") )
+            if( var_GetBool( p_playlist, "fullscreen" ) )
                  [[VLCCoreInteraction sharedInstance] toggleFullscreen];
         }
         /* handle Lion's default key combo for fullscreen-toggle in addition to our own hotkeys */
diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h
index 85f0552..d5c4a63 100644
--- a/modules/gui/macosx/misc.h
+++ b/modules/gui/macosx/misc.h
@@ -78,7 +78,6 @@
     BOOL b_isset_canBecomeKeyWindow;
     BOOL b_canBecomeMainWindow;
     BOOL b_isset_canBecomeMainWindow;
-    BOOL b_isFullscreen;
     NSViewAnimation *animation;
 }
 
@@ -98,9 +97,6 @@
 /* animate mode is only supported in >=10.4 */
 - (void)closeAndAnimate: (BOOL)animate;
 
-- (void)setFullscreen:(BOOL)b_var;
-
-- (BOOL)isFullscreen;
 @end
 
 
diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index de55de2..5a20bde 100644
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -274,7 +274,6 @@ static NSMutableArray *blackoutWindows = NULL;
     self = [super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag];
     if( self )
     {
-        b_isFullscreen = NO;
         b_isset_canBecomeKeyWindow = NO;
         /* we don't want this window to be restored on relaunch */
         if (OSX_LION)
@@ -463,16 +462,6 @@ static NSMutableArray *blackoutWindows = NULL;
     }
 }
 
-- (void)setFullscreen:(BOOL)b_var
-{
-    b_isFullscreen = b_var;
-}
-
-- (BOOL)isFullscreen
-{
-    return b_isFullscreen;
-}
-
 - (IBAction)fullscreen:(id)sender
 {
     [[VLCCoreInteraction sharedInstance] toggleFullscreen];
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index bf69bfa..ade67bc 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -49,10 +49,6 @@
 #include <vlc_dialog.h>
 #include "opengl.h"
 
- at interface NSWindow (VLCCustomCode)
-- (BOOL)isFullscreen;
- at end
-
 /* compilation support for 10.5 and 10.6 */
 #define OSX_LION NSAppKitVersionNumber >= 1115.2
 #ifndef MAC_OS_X_VERSION_10_7