Commit c6e47790 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files

video_output/opengllayer.m: Fix a warning, and use addVoutLayer: instead of addVoutView:.

parent 85031935
...@@ -66,6 +66,9 @@ ...@@ -66,6 +66,9 @@
# define GL_CLAMP_TO_EDGE 0x812F # define GL_CLAMP_TO_EDGE 0x812F
#endif #endif
@interface VLCVideoView : NSObject
- (void)addVoutLayer:(CALayer *)layer;
@end
/***************************************************************************** /*****************************************************************************
* Vout interface * Vout interface
...@@ -391,7 +394,7 @@ static int InitTextures( vout_thread_t *p_vout ) ...@@ -391,7 +394,7 @@ static int InitTextures( vout_thread_t *p_vout )
{ {
vout_thread_t * p_vout = [arg pointerValue]; vout_thread_t * p_vout = [arg pointerValue];
p_vout->p_sys->o_layer = [[VLCVideoLayer layerWithVout: p_vout] retain]; p_vout->p_sys->o_layer = [[VLCVideoLayer layerWithVout: p_vout] retain];
[p_vout->p_sys->o_cocoa_container addVoutSubview:p_vout->p_sys->o_layer]; [p_vout->p_sys->o_cocoa_container addVoutLayer:p_vout->p_sys->o_layer];
} }
- (void)setVout:(vout_thread_t*)_p_vout - (void)setVout:(vout_thread_t*)_p_vout
...@@ -503,9 +506,9 @@ static int InitTextures( vout_thread_t *p_vout ) ...@@ -503,9 +506,9 @@ static int InitTextures( vout_thread_t *p_vout )
http://developer.apple.com/documentation/GraphicsImaging/ http://developer.apple.com/documentation/GraphicsImaging/
Conceptual/OpenGL/chap5/chapter_5_section_44.html */ Conceptual/OpenGL/chap5/chapter_5_section_44.html */
long params[] = { 1 }; GLint params = 1;
CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval, CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval,
params ); &params );
CGLUnlockContext( context ); CGLUnlockContext( context );
return context; return context;
......
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