X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fmacosx%2Fvout.h;h=66f0a7272376d292b029871192760de6006f0db2;hb=faae87f60cdb42ba6db73a3c03a6f7e9040303cd;hp=2d5ae67ad35697d59bf9582ef6e074d393e1d6e8;hpb=17605dded6b1b46e0dd4b0bfa1010746027ffb6f;p=vlc

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index 2d5ae67ad3..66f0a72723 100644
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vout.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
@@ -14,7 +14,7 @@
  * 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
@@ -44,12 +44,17 @@
 /*****************************************************************************
  * VLCVoutView interface
  *****************************************************************************/
+@protocol VLCVoutViewResetting
++ (void)resetVout: (vout_thread_t *)p_vout;
+@end
+
 @interface VLCVoutView : NSView
 {
     vout_thread_t * p_vout;
-    NSView        * o_view;
     NSRect        * s_frame;
 
+    NSView <VLCVoutViewResetting> * o_view;
+
     vout_thread_t * p_real_vout;
     id              o_window;
 }
@@ -58,7 +63,7 @@
 - (void)closeVout;
 - (void)updateTitle;
 - (void)manage;
-- (void)scaleWindowWithFactor: (float)factor;
+- (void)scaleWindowWithFactor: (float)factor animate: (BOOL)animate;
 - (void)setOnTop:(BOOL)b_on_top;
 - (void)toggleFloatOnTop;
 - (void)toggleFullscreen;
@@ -67,9 +72,11 @@
 - (id)getWindow;
 
 + (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *) view
-                            frame: (NSRect *) s_frame;
+            frame: (NSRect *) s_frame;
 + (vout_thread_t *)getRealVout: (vout_thread_t *)p_vout;
 
+- (void)enterFullscreen;
+- (void)leaveFullscreen;
 @end
 
 /*****************************************************************************
@@ -92,44 +99,38 @@
 @interface VLCEmbeddedVoutView : VLCVoutView
 {
     BOOL b_used;
+    id o_embeddedwindow;
 }
 
+- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
+                 frame: (NSRect *)s_arg_frame showWindow: (BOOL)b_show_window;
+
 - (void)setUsed: (BOOL)b_new_used;
 - (BOOL)isUsed;
 
 @end
 
 /*****************************************************************************
- * VLCDetachedEmbeddedView interface
- *****************************************************************************/
-
-@interface VLCDetachedEmbeddedVoutView : VLCEmbeddedVoutView
-{
-}
-
-@end
-
-/*****************************************************************************
- * VLCWindow interface
+ * VLCVoutWindow interface
  *****************************************************************************/
-@interface VLCWindow : NSWindow
+@interface VLCVoutWindow : NSWindow
 {
     vout_thread_t * p_vout;
     VLCVoutView   * o_view;
     NSRect        * s_frame;
 
     vout_thread_t * p_real_vout;
-    Ptr             p_fullscreen_state;
-    vlc_bool_t      b_fullscreen;
-    vlc_bool_t      b_init_ok;
+    bool      b_init_ok;
+    bool      b_black;
+    bool      b_embedded;
 }
 
 - (id) initWithVout: (vout_thread_t *) p_vout view: (VLCVoutView *) view
                      frame: (NSRect *) s_frame;
-- (id)initReal: (id) sender;
+- (id)initMainThread: (id) sender;
 - (void)close;
 - (void)closeWindow;
-- (id)closeReal: (id) sender;
+- (id)closeMainThread: (id) sender;
 - (id)getVoutView;
 
 - (BOOL)windowShouldClose:(id)sender;