[vlc-commits] macosx/MainWindow: modernize getter

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Aug 24 12:56:45 2012 +0200| [a16d7de0cffacde3590cfe77a517078a2c0b00ea] | committer: Felix Paul Kühne

macosx/MainWindow: modernize getter

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

 modules/gui/macosx/MainWindow.h |    4 ++--
 modules/gui/macosx/MainWindow.m |    2 +-
 modules/gui/macosx/VideoView.m  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index 43143e8..dcd31e0 100644
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -146,6 +146,7 @@
     id o_current_video_window;
 }
 + (VLCMainWindow *)sharedInstance;
+ at property (readonly) BOOL fullscreen;
 
 - (IBAction)play:(id)sender;
 - (IBAction)prev:(id)sender;
@@ -165,7 +166,7 @@
 - (IBAction)dropzoneButtonAction:(id)sender;
 
 - (void)setTitle:(NSString *)title;
-- (void) customZoom:(id)sender;
+- (void)customZoom:(id)sender;
 - (void)windowResizedOrMoved:(NSNotification *)notification;
 
 - (void)showDropZone;
@@ -198,7 +199,6 @@
 
 /* fullscreen handling */
 - (void)showFullscreenController;
-- (BOOL)isFullscreen;
 - (void)lockFullscreenAnimation;
 - (void)unlockFullscreenAnimation;
 - (void)enterFullscreen;
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 5b75916..48ad18e 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -2043,7 +2043,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
         [o_fspanel fadeIn];
 }
 
-- (BOOL)isFullscreen
+- (BOOL)fullscreen
 {
     return b_fullscreen;
 }
diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VideoView.m
index 368dd75..17062df 100644
--- a/modules/gui/macosx/VideoView.m
+++ b/modules/gui/macosx/VideoView.m
@@ -268,7 +268,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
     // This is the result of [NSEvent standardMagnificationThreshold].
     // Unfortunately, this is a private API, currently.
     CGFloat f_threshold = 0.3;
-    BOOL b_fullscreen = [[VLCMainWindow sharedInstance] isFullscreen];
+    BOOL b_fullscreen = [[VLCMainWindow sharedInstance] fullscreen];
 
     if( ( f_cumulated_magnification > f_threshold && !b_fullscreen ) || ( f_cumulated_magnification < -f_threshold && b_fullscreen ) )
     {