Skip to content

V
vlc-1.1
Commit 21ad64a8 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

Use the nsobject for minimal_macosx.

parent 474d2d36
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/gui/minimal_macosx/VLCOpenGLVoutView.m
View file @ 21ad64a8
...@@ -49,12 +49,12 @@ int cocoaglvoutviewInit( vout_thread_t * p_vout ) ...@@ -49,12 +49,12 @@ int cocoaglvoutviewInit( vout_thread_t * p_vout )
msg_Dbg( p_vout, "Mac OS X Vout is opening" ); msg_Dbg( p_vout, "Mac OS X Vout is opening" );
var_Create( p_vout, "drawable-gl", VLC_VAR_DOINHERIT ); var_Create( p_vout, "drawable-nsobject", VLC_VAR_DOINHERIT );
var_Get( p_vout, "drawabl-gl", &value_drawable ); var_Get( p_vout, "drawable-nsobject", &value_drawable );
p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
o_cocoaglview_container = (id) value_drawable.i_int; o_cocoaglview_container = (id) value_drawable.p_address;
if (!o_cocoaglview_container) if (!o_cocoaglview_container)
{ {
msg_Warn( p_vout, "No drawable!, spawing a window" ); msg_Warn( p_vout, "No drawable!, spawing a window" );
...@@ -81,7 +81,7 @@ void cocoaglvoutviewEnd( vout_thread_t * p_vout ) ...@@ -81,7 +81,7 @@ void cocoaglvoutviewEnd( vout_thread_t * p_vout )
id <VLCOpenGLVoutEmbedding> o_cocoaglview_container; id <VLCOpenGLVoutEmbedding> o_cocoaglview_container;
msg_Dbg( p_vout, "Mac OS X Vout is closing" ); msg_Dbg( p_vout, "Mac OS X Vout is closing" );
var_Destroy( p_vout, "drawable-gl" ); var_Destroy( p_vout, "drawable-nsobject" );
o_cocoaglview_container = [p_vout->p_sys->o_glview container]; o_cocoaglview_container = [p_vout->p_sys->o_glview container];
......
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