Revert "Remove b_should_run_on_first_thread"

This reverts commit 4dc0b22b3371235fc1295a52d26562c979e87c5a.

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 5c761c23e21d80e0b49bb9f975ff5a70a4fe77d7..14898e38f04b029c883c65adb40e3b31a225a8ad 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -53,6 +53,10 @@ typedef struct intf_thread_t
 
     struct intf_thread_t *p_next; /** LibVLC interfaces book keeping */
     vlc_thread_t thread; /** LibVLC thread */
+    /* Thread properties and locks */
+#if defined( __APPLE__ )
+    bool          b_should_run_on_first_thread;
+#endif
 
     /* Specific interfaces */
     intf_sys_t *        p_sys;                          /** system interface */

diff --git a/src/interface/interface.c b/src/interface/interface.c
index b30cdb4e40e29876a87dc49b44ad01a98d1af4b6..b3a7c4876cb77be723a13d290c7779315dc37182 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -106,6 +106,11 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
 
     var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
 
+    /* Attach interface to LibVLC */
+#if defined( __APPLE__ )
+    p_intf->b_should_run_on_first_thread = false;
+#endif
+
     /* Choose the best module */
     p_intf->p_cfg = NULL;
     char *psz_parser = *chain == '$'
@@ -124,6 +129,17 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
         goto error;
     }
 
+#if defined( __APPLE__ )
+    /* Hack to get Mac OS X Cocoa runtime running
+     * (it needs access to the main thread) */
+    if( p_intf->b_should_run_on_first_thread )
+    {
+        libvlc_SetExitHandler( p_libvlc, vlc_object_kill, p_intf );
+        assert( p_intf->pf_run );
+        p_intf->pf_run( p_intf );
+    }
+    else
+#endif
     /* Run the interface in a separate thread */
     if( p_intf->pf_run
      && vlc_clone( &p_intf->thread,
@@ -176,6 +192,9 @@ void intf_DestroyAll( libvlc_int_t *p_libvlc )
         if( p_intf->pf_run )
         {
             vlc_cancel( p_intf->thread );
+#ifdef __APPLE__
+            if (!p_intf->b_should_run_on_first_thread)
+#endif
             vlc_join( p_intf->thread, NULL );
         }
         module_unneed( p_intf, p_intf->p_module );