* More code cleanup for OSX vout. Man what a mess this is :)

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

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index 07903b13482fa0cd5f22416242d46907c9866daa..34e5369bdd677d0dad868c385523ad8edd8df3bc 100644 (file)
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -2,7 +2,7 @@
  * vout.h: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.h,v 1.23 2004/02/09 13:28:32 titer Exp $
+ * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Florian G. Pflug <fgp@phlo.org>
@@ -59,29 +59,18 @@
  *****************************************************************************/
 @interface VLCGLView : NSOpenGLView
 {
-    vout_thread_t * p_vout;
-    int             i_effect;
-    int             b_init_done;
-    unsigned long   i_texture;
-    float           f_x;
-    float           f_y;
+    vout_thread_t   * p_vout;
+    int               i_effect;
+    unsigned long     pi_textures[2];
+    float             f_x;
+    float             f_y;
+    int               initDone;
 }
 
-- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) p_vout;
+- (id)   initWithFrame: (NSRect) frame vout: (vout_thread_t*) p_vout;
 - (void) initTextures;
-- (void) reloadTexture;
-
-@end
-
-/*****************************************************************************
- * VLCVout interface
- *****************************************************************************/
-@interface VLCVout : NSObject
-{
-}
-
-- (void)createWindow:(NSValue *)o_value;
-- (void)destroyWindow:(NSValue *)o_value;
+- (void) reloadTexture: (int) index;
+- (void) cleanUp;
 
 @end
 
@@ -90,12 +79,14 @@
  *****************************************************************************/
 struct vout_sys_t
 {
-    int i_opengl;
-    
+    NSAutoreleasePool *o_pool;
     NSRect s_rect;
-    int b_pos_saved;
     VLCWindow * o_window;
+    VLCQTView * o_qtview;
 
+    int i_opengl;
+    int b_pos_saved;
+    
     vlc_bool_t b_mouse_moved;
     mtime_t i_time_mouse_last_moved;
 
@@ -109,5 +100,9 @@ struct vout_sys_t
     Ptr p_fullscreen_state;
 #endif
 
+    /* OpenGL */
     VLCGLView * o_glview;
+    uint8_t   * p_data[2];
+    uint8_t   * p_data_orig[2];
+    int         i_cur_pic;
 };