OS X intf work

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

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index 2e072b6a47da875f28b84ba10320ab9448d3203a..de8588124a8f9e852305819400ea1e8a3e8fed28 100644 (file)
--- 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, 2002 VideoLAN
- * $Id: vout.h,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $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,64 +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;
+- (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;
 
-@end
-
-/*****************************************************************************
- * VLCView interface
- *****************************************************************************/
-@interface VLCView : NSQuickDrawView
-{
-    vout_thread_t * p_vout;
-}
-
-- (void)setVout:(vout_thread_t *)_p_vout;
+- (BOOL)windowShouldClose:(id)sender;
 
 @end
-
-/*****************************************************************************
- * vout_sys_t: MacOS X video output method descriptor
- *****************************************************************************/
-struct vout_sys_t
-{
-    intf_thread_t * p_intf;
-    VLCWindow * o_window;
-
-    NSRect s_rect;
-    int b_pos_saved;
-
-    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;
-    ImageSequence i_seq;
-    MatrixRecordPtr p_matrix;
-    DecompressorComponent img_dc;
-    ImageDescriptionHandle h_img_descr;
-#endif
-};
-
-/*****************************************************************************
- * vout_req_t: MacOS X video output request
- *****************************************************************************/
-#define VOUT_REQ_CREATE_WINDOW  0x00000001
-#define VOUT_REQ_DESTROY_WINDOW 0x00000002
-
-typedef struct vout_req_t
-{
-    int i_type;
-    int i_result;
-
-    NSConditionLock * o_lock;
-
-    vout_thread_t * p_vout;
-} vout_req_t;