* vout.h: MacOS X interface module
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.h,v 1.19 2004/01/28 21:31:15 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
*****************************************************************************/
@interface VLCGLView : NSOpenGLView
{
- @public
- int i_init_done;
- int i_textures_loaded;
- int i_index;
- 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;
}
-@end
-
-/*****************************************************************************
- * VLCVout interface
- *****************************************************************************/
-@interface VLCVout : NSObject
-{
-}
-
-- (void)createWindow:(NSValue *)o_value;
-- (void)destroyWindow:(NSValue *)o_value;
+- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) p_vout;
+- (void) initTextures;
+- (void) reloadTexture: (int) index;
+- (void) cleanUp;
@end
*****************************************************************************/
struct vout_sys_t
{
- int i_opengl;
-
+ NSAutoreleasePool *o_pool;
NSRect s_rect;
- int b_pos_saved;
VLCWindow * o_window;
- VLCGLView * o_glview;
+ VLCQTView * o_qtview;
+ int i_opengl;
+ int b_pos_saved;
+
vlc_bool_t b_mouse_moved;
mtime_t i_time_mouse_last_moved;
ImageDescriptionHandle h_img_descr;
Ptr p_fullscreen_state;
#endif
+
+ /* OpenGL */
+ VLCGLView * o_glview;
+ uint8_t * p_data[2];
+ uint8_t * p_data_orig[2];
+ int i_cur_pic;
};