Commit 5452eae7 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files

video_output/opengllayer.m: Rename the layer from VLCVideoLayer to...

video_output/opengllayer.m: Rename the layer from VLCVideoLayer to VLCVoutLayer, to avoid name collision with the framework.
parent f11a2b47
...@@ -94,7 +94,7 @@ vlc_module_begin(); ...@@ -94,7 +94,7 @@ vlc_module_begin();
set_callbacks( CreateVout, DestroyVout ); set_callbacks( CreateVout, DestroyVout );
vlc_module_end(); vlc_module_end();
@interface VLCVideoLayer : CAOpenGLLayer { @interface VLCVoutLayer : CAOpenGLLayer {
vout_thread_t * p_vout; vout_thread_t * p_vout;
} }
+ (id)layerWithVout:(vout_thread_t*)_p_vout; + (id)layerWithVout:(vout_thread_t*)_p_vout;
...@@ -119,7 +119,7 @@ struct vout_sys_t ...@@ -119,7 +119,7 @@ struct vout_sys_t
GLuint p_textures[2]; GLuint p_textures[2];
NSAutoreleasePool *autorealease_pool; NSAutoreleasePool *autorealease_pool;
VLCVideoLayer * o_layer; VLCVoutLayer * o_layer;
id o_cocoa_container; id o_cocoa_container;
}; };
...@@ -224,7 +224,7 @@ static int Init( vout_thread_t *p_vout ) ...@@ -224,7 +224,7 @@ static int Init( vout_thread_t *p_vout )
I_OUTPUTPICTURES = 1; I_OUTPUTPICTURES = 1;
p_sys->autorealease_pool = [[NSAutoreleasePool alloc] init]; p_sys->autorealease_pool = [[NSAutoreleasePool alloc] init];
[VLCVideoLayer performSelectorOnMainThread:@selector(autoinitInVout:) [VLCVoutLayer performSelectorOnMainThread:@selector(autoinitInVout:)
withObject:[NSValue valueWithPointer:p_vout] withObject:[NSValue valueWithPointer:p_vout]
waitUntilDone:YES]; waitUntilDone:YES];
...@@ -381,9 +381,9 @@ static int InitTextures( vout_thread_t *p_vout ) ...@@ -381,9 +381,9 @@ static int InitTextures( vout_thread_t *p_vout )
} }
/***************************************************************************** /*****************************************************************************
* @implementation VLCVideoLayer * @implementation VLCVoutLayer
*/ */
@implementation VLCVideoLayer @implementation VLCVoutLayer
/***************************************************************************** /*****************************************************************************
* autoinitInVout: Called from the video thread to create a layer. * autoinitInVout: Called from the video thread to create a layer.
...@@ -393,7 +393,7 @@ static int InitTextures( vout_thread_t *p_vout ) ...@@ -393,7 +393,7 @@ static int InitTextures( vout_thread_t *p_vout )
+ (void)autoinitInVout:(NSValue*)arg + (void)autoinitInVout:(NSValue*)arg
{ {
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 = [[VLCVoutLayer layerWithVout: p_vout] retain];
[p_vout->p_sys->o_cocoa_container addVoutLayer:p_vout->p_sys->o_layer]; [p_vout->p_sys->o_cocoa_container addVoutLayer:p_vout->p_sys->o_layer];
} }
...@@ -404,7 +404,7 @@ static int InitTextures( vout_thread_t *p_vout ) ...@@ -404,7 +404,7 @@ static int InitTextures( vout_thread_t *p_vout )
+ (id)layerWithVout:(vout_thread_t*)_p_vout + (id)layerWithVout:(vout_thread_t*)_p_vout
{ {
VLCVideoLayer* me = [super layer]; VLCVoutLayer* me = [super layer];
if( me ) if( me )
{ {
me.asynchronous = YES; me.asynchronous = YES;
......
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