[vlc-devel] commit: mozilla: video is displayed again (Jean-Paul Saman )

[Derk-Jan Hartman]

On 20 feb 2009, at 15:06, git version control wrote:
> vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Fri  
> Feb 20 11:55:22 2009 +0100|  
> [e538b7082ff17fb1ff04ea89cc4dd2e8143122ae] | committer: Jean-Paul  
> Saman
>
> mozilla: video is displayed again

This is incorrect and should be reverted. an X11 windows id is not an  
apple window/drawable ID. The better strategy is to define a drawable- 
agl

DJ


>
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e538b7082ff17fb1ff04ea89cc4dd2e8143122ae
> ---
>
> modules/gui/macosx/voutgl.m |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m
> index 47dac9e..831f059 100644
> --- a/modules/gui/macosx/voutgl.m
> +++ b/modules/gui/macosx/voutgl.m
> @@ -110,11 +110,11 @@ int OpenVideoGL  ( vlc_object_t * p_this )
>
>     p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
>     if( p_vout->p_sys == NULL )
> -        return( 1 );
> +        return VLC_ENOMEM;
>
>     memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
>
> -    var_Get( p_vout->p_libvlc, "drawable", &value_drawable );
> +    var_Get( p_vout->p_libvlc, "drawable-xid", &value_drawable );
>     if( value_drawable.i_int != 0 )
>     {
>         static const GLint ATTRIBUTES[] = {
> @@ -497,7 +497,7 @@ static int aglInit( vout_thread_t * p_vout )
>     Rect viewBounds;
>     Rect clipBounds;
>
> -    var_Get( p_vout->p_libvlc, "drawable", &val );
> +    var_Get( p_vout->p_libvlc, "drawable-xid", &val );
>     p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
>     aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys- 
> >agl_drawable);
>
> @@ -617,7 +617,7 @@ static int aglManage( vout_thread_t * p_vout )
>             Rect viewBounds;
>             Rect clipBounds;
>
> -            var_Get( p_vout->p_libvlc, "drawable", &val );
> +            var_Get( p_vout->p_libvlc, "drawable-xid", &val );
>             p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
>             aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys- 
> >agl_drawable);
>
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>