X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvout.h;h=de8588124a8f9e852305819400ea1e8a3e8fed28;hb=699e4bb62df2e5b70a4f08c179686af1369a1a21;hp=b65be8f0764eaf46bff8d1d276b38a7cb03d9e8c;hpb=d86fd15629ed0d4ad3909ec43a4e654f62b2f9e2;p=vlc

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index b65be8f076..de8588124a 100644
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -1,12 +1,13 @@
 /*****************************************************************************
- * vout.h: MacOS X interface plugin
+ * vout.h: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.h,v 1.12 2003/08/14 12:38:03 garf Exp $
+ * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
+ *          Eric Petit <titer@m0k.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
@@ -29,67 +30,27 @@
 @interface VLCWindow : NSWindow
 {
     vout_thread_t * p_vout;
+    vout_thread_t * p_real_vout;
+
+    Ptr             p_fullscreen_state;
+    mtime_t         i_time_mouse_last_moved;
 }
 
-- (void)setVout:(vout_thread_t *)_p_vout;
-- (vout_thread_t *)getVout;
+- (id)initWithVout:(vout_thread_t *)_p_vout
+    frame:(NSRect *)s_frame;
+- (void)close;
+- (void)setOnTop:(BOOL)b_on_top;
+
+- (void)hideMouse:(BOOL)b_hide;
+- (void)manage;
 
 - (void)scaleWindowWithFactor: (float)factor;
 - (void)toggleFloatOnTop;
 - (void)toggleFullscreen;
 - (BOOL)isFullscreen;
+- (void)snapshot;
 - (void)updateTitle;
 
 - (BOOL)windowShouldClose:(id)sender;
 
 @end
-
-/*****************************************************************************
- * VLCView interface
- *****************************************************************************/
-@interface VLCView : NSQuickDrawView
-{
-}
-
-@end
-
-/*****************************************************************************
- * VLCVout interface
- *****************************************************************************/
-@interface VLCVout : NSObject
-{
-}
-
-- (void)createWindow:(NSValue *)o_value;
-- (void)destroyWindow:(NSValue *)o_value;
-
-@end
-
-/*****************************************************************************
- * vout_sys_t: MacOS X video output method descriptor
- *****************************************************************************/
-struct vout_sys_t
-{
-    NSRect s_rect;
-    int b_pos_saved;
-    VLCWindow * o_window;
-
-    vlc_bool_t b_mouse_moved;
-    vlc_bool_t b_mouse_pointer_visible;
-    mtime_t i_time_mouse_last_moved;
-
-#ifdef __QUICKTIME__
-    CodecType i_codec;
-    CGrafPtr p_qdport;
-    CGrafPtr p_qdportold;
-    ImageSequence i_seq;
-    MatrixRecordPtr p_matrix;
-    DecompressorComponent img_dc;
-    ImageDescriptionHandle h_img_descr;
-    Ptr p_fullscreen_state;
-    RgnHandle mask;
-    int portx;
-    int porty;
-    int isplugin;
-#endif
-};