Commit 581f3e40 authored by Eric Petit's avatar Eric Petit

+ macosx/vout*: use two pictures and OpenGL textures so a texture

                 cannot be affected by VLC loading the next picture
		 (should fix the artifacts when moving or resizing
		  the window)
parent 90376941
...@@ -61,7 +61,8 @@ ...@@ -61,7 +61,8 @@
{ {
vout_thread_t * p_vout; vout_thread_t * p_vout;
int i_effect; int i_effect;
unsigned long i_texture; unsigned long pi_textures[2];
int i_curTexture;
float f_x; float f_x;
float f_y; float f_y;
int initDone; int initDone;
...@@ -72,7 +73,7 @@ ...@@ -72,7 +73,7 @@
- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) p_vout; - (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) p_vout;
- (void) initTextures; - (void) initTextures;
- (void) reloadTexture; - (void) reloadTexture: (int) index;
- (void) goFullScreen; - (void) goFullScreen;
- (void) exitFullScreen; - (void) exitFullScreen;
- (void) cleanUp; - (void) cleanUp;
...@@ -115,5 +116,9 @@ struct vout_sys_t ...@@ -115,5 +116,9 @@ struct vout_sys_t
Ptr p_fullscreen_state; Ptr p_fullscreen_state;
#endif #endif
/* OpenGL */
VLCGLView * o_glview; VLCGLView * o_glview;
uint8_t * p_data[2];
uint8_t * p_data_orig[2];
int i_cur_pic;
}; };
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment