Removes trailing spaces. Removes tabs.

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

diff --git a/modules/gui/macosx/embeddedwindow.h b/modules/gui/macosx/embeddedwindow.h
index 5240343b3ba340b1b6ed38253e6e28033ed9eade..7534871c5a787de4d8fc38fc8f2fb3e1336cee54 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.h
+++ b/modules/gui/macosx/embeddedwindow.h
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * embeddedwindow.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2004 the VideoLAN team
- * $Id: playlistinfo.h 11664 2005-07-09 06:17:09Z courmisch $
+ * Copyright (C) 2005-2006 the VideoLAN team
+ * $Id$
  *
- * Authors: Benjamin Pracht <bigben at videolan dot org> 
+ * Authors: Benjamin Pracht <bigben at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18,15 +18,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * VLCEmbeddedWindow interface
  *****************************************************************************/
 
+#import "misc.h"
 
-@interface VLCEmbeddedWindow : NSObject
+@interface VLCEmbeddedWindow : NSWindow
 {
     IBOutlet id o_btn_backward;
     IBOutlet id o_btn_forward;
@@ -34,18 +35,43 @@
     IBOutlet id o_btn_play;
     IBOutlet id o_slider;
     IBOutlet id o_time;
-    IBOutlet id o_window;
+    IBOutlet id o_view;
 
     NSImage * o_img_play;
     NSImage * o_img_play_pressed;
     NSImage * o_img_pause;
     NSImage * o_img_pause_pressed;
+
+    VLCWindow       * o_fullscreen_window;
+    NSViewAnimation * o_fullscreen_anim1;
+    NSViewAnimation * o_fullscreen_anim2;
+    NSView          * o_temp_view;
+    /* set to yes if we are fullscreen and all animations are over */
+    BOOL              b_fullscreen;
+    BOOL              b_animation_lock_alreadylocked;
+    NSRecursiveLock * o_animation_lock;
 }
 
 - (void)setTime:(NSString *)o_arg_ime position:(float)f_position;
 - (void)playStatusUpdated:(int)i_status;
 - (void)setSeekable:(BOOL)b_seekable;
-- (void)setFullscreen:(BOOL)b_fullscreen;
 
+- (NSView *)mainView;
+
+- (BOOL)isFullscreen;
+
+- (void)lockFullscreenAnimation;
+- (void)unlockFullscreenAnimation;
+
+- (void)enterFullscreen;
+- (void)leaveFullscreen;
+/* Allows to leave fullscreen by simply fading out the display */
+- (void)leaveFullscreenAndFadeOut: (BOOL)fadeout;
+
+/* private */
+- (void)hasEndedFullscreen;
+- (void)hasBecomeFullscreen;
+
+- (void)setFrameOnMainThread:(NSData*)packedargs;
 @end