macosx/vout* : OpenGL VRAM texturing finaly works correctly now.

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

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index 4e7e92664c5cd7bab7adfe5cbec7735cb85906e4..fc72e264f75e9cf9c38dccea36979a9be4f0a82d 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-2003 VideoLAN
- * $Id: vout.h,v 1.15 2003/11/06 16:28:28 hartman Exp $
+ * $Id: vout.h,v 1.22 2004/02/03 13:00:27 titer Exp $
  *
  * 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
@@ -47,12 +48,30 @@
 /*****************************************************************************
  * VLCView interface
  *****************************************************************************/
-@interface VLCView : NSQuickDrawView
+@interface VLCQTView : NSQuickDrawView
 {
 }
 
 @end
 
+/*****************************************************************************
+ * VLCView interface
+ *****************************************************************************/
+@interface VLCGLView : NSOpenGLView
+{
+    vout_thread_t * p_vout;
+    int             b_init_done;
+    unsigned long   i_texture;
+    float           f_x;
+    float           f_y;
+}
+
+- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) p_vout;
+- (void) initTextures;
+- (void) reloadTexture;
+
+@end
+
 /*****************************************************************************
  * VLCVout interface
  *****************************************************************************/
@@ -70,13 +89,11 @@
  *****************************************************************************/
 struct vout_sys_t
 {
+    int i_opengl;
+    
     NSRect s_rect;
     int b_pos_saved;
     VLCWindow * o_window;
-    Rect rect;
-    int portx;
-    int porty;
-    int isplugin;
 
     vlc_bool_t b_mouse_moved;
     mtime_t i_time_mouse_last_moved;
@@ -84,12 +101,12 @@ struct vout_sys_t
 #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;
 #endif
+
+    VLCGLView * o_glview;
 };