* 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 6d7dc4811c57dcdbd55d12a395b27351971abd42..f2e76de19cfaaa26bc37f641c01f107a05a919ed 100644 (file)
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -2,11 +2,12 @@
  * vout.h: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.h,v 1.20 2004/01/29 02:01:49 titer 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
@@ -58,12 +59,18 @@
  *****************************************************************************/
 @interface VLCGLView : NSOpenGLView
 {
-    int           i_init_done;
-    unsigned long i_texture;
+    vout_thread_t   * p_vout;
+    int               i_effect;
+    unsigned long     pi_textures[2];
+    float             f_x;
+    float             f_y;
+    int               initDone;
 }
 
-- (void) initTexture;
-- (void) reloadTexture: (uint8_t *) buffer;
+- (id)   initWithFrame: (NSRect) frame vout: (vout_thread_t*) p_vout;
+- (void) initTextures;
+- (void) reloadTexture: (int) index;
+- (void) cleanUp;
 
 @end
 
@@ -103,5 +110,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;
 };