ASF: help stupid compiler

[vlc] / modules / gui / macosx / MainWindow.h

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index c8176831107b8acd09b37141e7223344428eb91c..3b2552ae85a4d41fc79facbaa195c55dcc6e3bd0 100644 (file)
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * MainWindow.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2011 VideoLAN
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
@@ -25,15 +25,12 @@
  *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
+#import "CompatibilityFixes.h"
 #import "PXSourceList.h"
 #import <vlc_input.h>
 #import "misc.h"
 #import "fspanel.h"
 
-#ifndef MAC_OS_X_VERSION_10_6
-@protocol NSAnimationDelegate <NSObject> @end
-#endif
-
 @interface VLCMainWindow : NSWindow <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate, NSAnimationDelegate> {
     IBOutlet id o_play_btn;
     IBOutlet id o_bwd_btn;
@@ -61,6 +58,7 @@
     IBOutlet id o_playlist_table;
     IBOutlet id o_video_view;
     IBOutlet id o_split_view;
+    IBOutlet id o_left_split_view;
     IBOutlet id o_right_split_view;
     IBOutlet id o_sidebar_view;
     IBOutlet id o_chosen_category_lbl;
@@ -72,6 +70,7 @@
     IBOutlet VLCFSPanel *o_fspanel;
 
     BOOL b_dark_interface;
+    BOOL b_nativeFullscreenMode;
     BOOL b_video_playback_enabled;
     int i_lastShownVolume;
     BOOL b_mute;
@@ -98,6 +97,9 @@
     BOOL just_triggered_previous;
     NSMutableArray *o_sidebaritems;
 
+    VLCWindow       * o_nonembedded_window;
+    BOOL              b_nonembedded;
+
     VLCWindow       * o_fullscreen_window;
     NSViewAnimation * o_fullscreen_anim1;
     NSViewAnimation * o_fullscreen_anim2;
@@ -147,6 +149,7 @@
 - (void)setNativeVideoSize:(NSSize)size;
 
 /* fullscreen handling */
+- (void)showFullscreenController;
 - (BOOL)isFullscreen;
 - (void)lockFullscreenAnimation;
 - (void)unlockFullscreenAnimation;
@@ -157,7 +160,9 @@
 - (void)hasBecomeFullscreen;
 - (void)setFrameOnMainThread:(NSData*)packedargs;
 
-- (id)fspanel;
+/* lion's native fullscreen handling */
+- (void)windowWillEnterFullScreen:(NSNotification *)notification;
+- (void)windowWillExitFullScreen:(NSNotification *)notification;
 
 @end