Commit 76aa2649 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Revert "mozilla: video is displayed again"

This reverts commit e538b708.

I misunderstood the usage case for drawable-xid. MacOS X AGL needs a separate instance of drawable events.
parent 07a69e82
...@@ -110,11 +110,11 @@ int OpenVideoGL ( vlc_object_t * p_this ) ...@@ -110,11 +110,11 @@ int OpenVideoGL ( vlc_object_t * p_this )
p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL ) if( p_vout->p_sys == NULL )
return VLC_ENOMEM; return( 1 );
memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) ); memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
var_Get( p_vout->p_libvlc, "drawable-xid", &value_drawable ); var_Get( p_vout->p_libvlc, "drawable", &value_drawable );
if( value_drawable.i_int != 0 ) if( value_drawable.i_int != 0 )
{ {
static const GLint ATTRIBUTES[] = { static const GLint ATTRIBUTES[] = {
...@@ -497,7 +497,7 @@ static int aglInit( vout_thread_t * p_vout ) ...@@ -497,7 +497,7 @@ static int aglInit( vout_thread_t * p_vout )
Rect viewBounds; Rect viewBounds;
Rect clipBounds; Rect clipBounds;
var_Get( p_vout->p_libvlc, "drawable-xid", &val ); var_Get( p_vout->p_libvlc, "drawable", &val );
p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int; p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable); 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 ) ...@@ -617,7 +617,7 @@ static int aglManage( vout_thread_t * p_vout )
Rect viewBounds; Rect viewBounds;
Rect clipBounds; Rect clipBounds;
var_Get( p_vout->p_libvlc, "drawable-xid", &val ); var_Get( p_vout->p_libvlc, "drawable", &val );
p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int; p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable); aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);
......
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