Revert "mozilla: video is displayed again"
authorJean-Paul Saman <jpsaman@videolan.org>
Fri, 20 Feb 2009 16:09:42 +0000 (17:09 +0100)
committerJean-Paul Saman <jpsaman@videolan.org>
Fri, 20 Feb 2009 16:12:15 +0000 (17:12 +0100)
This reverts commit e538b7082ff17fb1ff04ea89cc4dd2e8143122ae.

I misunderstood the usage case for drawable-xid. MacOS X AGL needs a separate instance of drawable events.

modules/gui/macosx/voutgl.m

index 831f059..47dac9e 100644 (file)
@@ -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 VLC_ENOMEM;
+        return( 1 );
 
     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 )
     {
         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-xid", &val );
+    var_Get( p_vout->p_libvlc, "drawable", &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-xid", &val );
+            var_Get( p_vout->p_libvlc, "drawable", &val );
             p_vout->p_sys->agl_drawable = (AGLDrawable)val.i_int;
             aglSetDrawable(p_vout->p_sys->agl_ctx, p_vout->p_sys->agl_drawable);