Changeset ad407ff30380e98896cefc46882452e28aef10dc

Timestamp:

23/12/07 17:48:15 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1198428495 +0000

git-parent:

[a19eff66700e36ac1d0a16fc04a206d1ee00cb20]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1198428495 +0000

Message:

modules/video_output/opengllayer.m: Don't free the gl texture in End(), but in the releaseGLContext function. Set the original bounds of the CALayer. Protect the removeFromSuperlayer by a CATransaction.

Files:

• modules/video_output/opengllayer.m (modified) (4 diffs)

modules/video_output/opengllayer.m

@@ -238 +238 @@
-    p_vout->p_sys->b_frame_available = 0;
-
+    [CATransaction performSelectorOnMainThread:@selector(begin)
+                    withObject:nil waitUntilDone:YES];
+
-    [p_sys->o_layer performSelectorOnMainThread:@selector(removeFromSuperlayer)
-                    withObject:nil waitUntilDone:YES];
+    [CATransaction performSelectorOnMainThread:@selector(commit)
+                    withObject:nil waitUntilDone:YES];
+
+    // Should be done automatically
-    [p_sys->o_layer release];
-    [p_sys->autorealease_pool release];
-
-    /* Free the texture buffer*/
-    glDeleteTextures( 2, p_sys->p_textures );
-    if( p_sys->pp_buffer[0] ) free( p_sys->pp_buffer[0] );
-    if( p_sys->pp_buffer[1] ) free( p_sys->pp_buffer[1] );
@@ -305 +311 @@
-
-    p_sys->b_frame_available = 1;
+    [p_sys->o_layer setNeedsDisplay];
-}
-
@@ -401 +408 @@
-        me.asynchronous = YES;
-        [me setVout: _p_vout];
+        me.bounds = CGRectMake( 0.0, 0.0,  (float)_p_vout->output.i_height,  (float)_p_vout->output.i_width );
+
-    }
-    return me;
@@ -493 +502 @@
-    return context;
-}
+
+- (void)releaseCGLContext:(CGLContextObj)glContext
+{
+    CGLLockContext( glContext );
+    CGLSetCurrentContext( glContext );
+    
+    glDeleteTextures( 2, p_vout->p_sys->p_textures );
+
+    CGLUnlockContext( glContext );
+}
+
-@end