Commit d4b55453 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: ugly compilation fix as VLC_OBJECT_OPENGL was removed

Compatibility with the caca and x11 vouts needs to be checked
parent 14a587b0
...@@ -694,16 +694,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -694,16 +694,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
{ {
/* p_real_vout: the vout we have to use to check for video-on-top /* p_real_vout: the vout we have to use to check for video-on-top
and a few other things. If we are the QuickTime output, it's us. and a few other things. If we are the QuickTime output, it's us.
It we are the OpenGL provider, it is our parent. */ It we are the OpenGL provider, it is our parent.
if( p_vout->i_object_type == VLC_OBJECT_OPENGL ) Since we can't be the QuickTime output anymore, we need to be
{ the parent.
return (vout_thread_t *) p_vout->p_parent; FIXME: check with the caca and x11 vouts! */
} return (vout_thread_t *) p_vout->p_parent;
else
{
return p_vout;
}
} }
+ (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *)view + (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *)view
......
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