X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fembeddedwindow.h;h=f451b51697d4f896b1e6a6ad0bd4a9324a1f6167;hb=96b4ee1ee2da310e9ea951a29672a7609dbf831e;hp=0c242683b93b87ef8e56c9c9268e1d13291d40c6;hpb=94f061cd0677ce67db817072a3bbf77a64da32e7;p=vlc

diff --git a/modules/gui/macosx/embeddedwindow.h b/modules/gui/macosx/embeddedwindow.h
index 0c242683b9..f451b51697 100644
--- a/modules/gui/macosx/embeddedwindow.h
+++ b/modules/gui/macosx/embeddedwindow.h
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * embeddedwindow.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
+ * Copyright (C) 2005-2007 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
@@ -41,8 +41,6 @@
     NSImage * o_img_play_pressed;
     NSImage * o_img_pause;
     NSImage * o_img_pause_pressed;
-    
-    NSRect o_saved_frame;
 
     VLCWindow       * o_fullscreen_window;
     NSViewAnimation * o_fullscreen_anim1;
@@ -50,18 +48,33 @@
     NSView          * o_temp_view;
     /* set to yes if we are fullscreen and all animations are over */
     BOOL              b_fullscreen;
+    NSRecursiveLock * o_animation_lock;
+
+    BOOL              b_window_is_invisible;
+
+    NSSize videoRatio;
+    NSInteger originalLevel;
 }
 
-- (void)setTime:(NSString *)o_arg_ime position:(float)f_position;
-- (void)playStatusUpdated:(int)i_status;
-- (void)setSeekable:(BOOL)b_seekable;
+- (void)controlTintChanged;
+
+- (void)setTime: (NSString *)o_arg_ime position: (float)f_position;
+- (void)playStatusUpdated: (int)i_status;
+- (void)setSeekable: (BOOL)b_seekable;
+
+- (void)setVideoRatio:(NSSize)ratio;
 
 - (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;