* reenable the prefs. this was a small leftover from debugging

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

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index cd1e820f60200d2e736171a455783ec6da4b84b0..f2e76de19cfaaa26bc37f641c01f107a05a919ed 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.14 2003/11/05 00:40:08 hartman 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
@@ -47,12 +48,32 @@
 /*****************************************************************************
  * VLCView interface
  *****************************************************************************/
-@interface VLCView : NSQuickDrawView
+@interface VLCQTView : NSQuickDrawView
 {
 }
 
 @end
 
+/*****************************************************************************
+ * VLCView interface
+ *****************************************************************************/
+@interface VLCGLView : NSOpenGLView
+{
+    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;
+- (void) initTextures;
+- (void) reloadTexture: (int) index;
+- (void) cleanUp;
+
+@end
+
 /*****************************************************************************
  * VLCVout interface
  *****************************************************************************/
@@ -70,27 +91,28 @@
  *****************************************************************************/
 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;
-    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;
 #endif
+
+    /* OpenGL */
+    VLCGLView * o_glview;
+    uint8_t   * p_data[2];
+    uint8_t   * p_data_orig[2];
+    int         i_cur_pic;
 };