[vlc-devel] commit: macosx: ugly compilation fix as VLC_OBJECT_OPENGL was removed ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Oct  3 15:45:19 2008 +0200| [d4b55453aa9284ce720f6e2b692d9fd2f2f4e825] | committer: 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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d4b55453aa9284ce720f6e2b692d9fd2f2f4e825
---

 modules/gui/macosx/vout.m |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 5880fcf..68bc7ae 100644
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -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
        and a few other things. If we are the QuickTime output, it's us.
-       It we are the OpenGL provider, it is our parent. */
-    if( p_vout->i_object_type == VLC_OBJECT_OPENGL )
-    {
-        return (vout_thread_t *) p_vout->p_parent;
-    }
-    else
-    {
-        return p_vout;
-    }
-
+       It we are the OpenGL provider, it is our parent.
+       Since we can't be the QuickTime output anymore, we need to be
+       the parent.
+       FIXME: check with the caca and x11 vouts! */
+    return (vout_thread_t *) p_vout->p_parent;
 }
 
 + (id)getVoutView: (vout_thread_t *)p_vout subView: (NSView *)view