Changeset 40792ebd37f77c25079bcc0ae5ababc64703328b

Timestamp:

08/06/07 11:24:23 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[ddb469c7f7f290d06411f690fa04b4b920882e76]

git-author:

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

Message:

Mac OS X gui: Comply to "Cocoa Thread Safety" guideline, that is, make creating, resizing, closing, the NSView on main thread.

Files:

• modules/gui/macosx/vout.m (modified) (2 diffs)
• modules/gui/macosx/voutgl.m (modified) (6 diffs)

modules/gui/macosx/vout.m

@@ -758 +758 @@
-- (void)enterFullscreen
-{
-resetVout: p_vout
+performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES
-    [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
-}
@@ -764 +764 @@
-- (void)leaveFullscreen
-{
-resetVout: p_vout
+performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES
-    [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];
-}

modules/gui/macosx/voutgl.m

@@ -172 +172 @@
-        p_vout->p_sys->b_embedded = VLC_FALSE;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        {
-            return VLC_EGENERIC;
-        }
+
-        p_vout->pf_init   = Init;
-        p_vout->pf_end    = End;
@@ -210 +206 @@
-
-        /* Close the window */
-closeVout
+performSelectorOnMainThread:@selector(closeVout) withObject:NULL waitUntilDone:YES
-
-        [o_pool release];
@@ -308 +304 @@
- *****************************************************************************/
-@implementation VLCGLView
++ (void)initVout:(NSValue *)arg
+{
+    vout_thread_t * p_vout = [arg pointerValue];
+
+    /* Create the GL view */
+    p_vout->p_sys->o_glview = [[VLCGLView alloc] initWithVout: p_vout];
+    [p_vout->p_sys->o_glview autorelease];
+
+    /* Spawn the window */
+    p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout
+                        subView: p_vout->p_sys->o_glview frame: nil];
+}
-
-/* This function will reset the o_vout_view. It's useful to go fullscreen. */
-
-
+
+
+
+
-    if( p_vout->b_fullscreen )
-    {
@@ -345 +355 @@
-- (id) initWithVout: (vout_thread_t *) vout
-{
+    /* Must be called from main thread:
+     * "The NSView class is generally thread-safe, with a few exceptions. You
+     * should create, destroy, resize, move, and perform other operations on NSView
+     * objects only from the main thread of an application. Drawing from secondary
+     * threads is thread-safe as long as you bracket drawing calls with calls to
+     * lockFocusIfCanDraw and unlockFocus." Cocoa Thread Safety */
+
-    p_vout = vout;
-
@@ -419 +436 @@
-                ( bounds.size.height - y ) / 2, x, y );
-
+    [super reshape];
+
-    if( p_vout->p_sys->b_got_frame )
-    {
@@ -435 +454 @@
-        Unlock( p_vout );
-    }
-    [super reshape];
-}
-