vlc/vlc-2.0 | branch: master | David Fuhrmann <[email protected]> | Mon Jul 23 13:18:10 2012 +0200| [c4ea557137df26c5b73500de42fb3f8ec3484f85] | committer: Felix Paul Kühne
macosx: remove outdated and unused isFullscreen methods (cherry picked from commit 18dee68f3ace8adfda6e5982daa41755103f9723) Signed-off-by: Felix Paul Kühne <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=c4ea557137df26c5b73500de42fb3f8ec3484f85 --- 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 75b7f9c..3946aff 100644 --- a/modules/gui/macosx/MainWindow.h +++ b/modules/gui/macosx/MainWindow.h @@ -209,7 +209,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 4e508b0..c694fff 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -1785,7 +1785,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]; @@ -2656,11 +2655,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 55d5204..e71586e 100644 --- a/modules/gui/macosx/VideoView.m +++ b/modules/gui/macosx/VideoView.m @@ -149,7 +149,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 28762aa..136bdb4 100644 --- a/modules/gui/macosx/misc.h +++ b/modules/gui/macosx/misc.h @@ -62,7 +62,6 @@ BOOL b_isset_canBecomeKeyWindow; BOOL b_canBecomeMainWindow; BOOL b_isset_canBecomeMainWindow; - BOOL b_isFullscreen; NSViewAnimation *animation; } @@ -82,9 +81,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 9c313b0..a134f5b 100644 --- a/modules/gui/macosx/misc.m +++ b/modules/gui/macosx/misc.m @@ -180,7 +180,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) @@ -369,16 +368,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 2cc5c11..b1dd73a 100644 --- a/modules/video_output/macosx.m +++ b/modules/video_output/macosx.m @@ -48,10 +48,6 @@ #include <vlc_dialog.h> #include "opengl.h" -@interface NSWindow (VLCCustomCode) -- (BOOL)isFullscreen; -@end - /* compilation support for 10.5 and 10.6 */ #define OSX_LION NSAppKitVersionNumber >= 1115.2 #ifndef MAC_OS_X_VERSION_10_7 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
