X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finterface.c;h=e268c7c8d0fb1764ff21bb7606bfca341c2d4ed7;hb=974a5e403890f924980be2add6983913c520c94f;hp=1e15b8c1b98be9519ed448697a62e34ce2cad7ff;hpb=ed2a403f13bf8265d16ec5a721f8b27e07945e79;p=vlc

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 1e15b8c1b9..e268c7c8d0 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -49,8 +49,10 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static void RunInterface( intf_thread_t *p_intf );
-
+static void* RunInterface( vlc_object_t *p_this );
+#ifdef __APPLE__
+static void * MonitorLibVLCDeath( vlc_object_t *p_this );
+#endif
 static int AddIntfCallback( vlc_object_t *, char const *,
                             vlc_value_t , vlc_value_t , void * );
 
@@ -92,15 +94,11 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
     /* Allocate structure */
     p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF );
     if( !p_intf )
-    {
-        msg_Err( p_this, "out of memory" );
         return NULL;
-    }
-    p_intf->pf_request_window = NULL;
-    p_intf->pf_release_window = NULL;
-    p_intf->pf_control_window = NULL;
     p_intf->b_interaction = false;
+#ifdef __APPLE__
     p_intf->b_should_run_on_first_thread = false;
+#endif
 
     /* Choose the best module */
     p_intf->psz_intf = strdup( psz_module );
@@ -141,16 +139,30 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
  */
 int intf_RunThread( intf_thread_t *p_intf )
 {
+#ifdef __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 )
     {
-        RunInterface( p_intf );
+        if( vlc_thread_create( p_intf, "interface", MonitorLibVLCDeath,
+                               VLC_THREAD_PRIORITY_LOW, false ) )
+        {
+            msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
+            return VLC_EGENERIC;
+        }
+        RunInterface( VLC_OBJECT(p_intf) );
+
+        /* Make sure our MonitorLibVLCDeath thread exit */
+        vlc_object_kill( p_intf );
+        /* It is monitoring libvlc, not the p_intf */
+        vlc_object_signal( p_intf->p_libvlc );
+        vlc_thread_join( p_intf );
+
         vlc_object_detach( p_intf );
         vlc_object_release( p_intf );
         return VLC_SUCCESS;
     }
-    
+#endif
     /* Run the interface in a separate thread */
     if( vlc_thread_create( p_intf, "interface", RunInterface,
                            VLC_THREAD_PRIORITY_LOW, false ) )
@@ -173,7 +185,6 @@ void intf_StopThread( intf_thread_t *p_intf )
 {
     /* Tell the interface to die */
     vlc_object_kill( p_intf );
-    vlc_cond_signal( &p_intf->object_wait );
     vlc_thread_join( p_intf );
 }
 
@@ -182,10 +193,12 @@ void intf_StopThread( intf_thread_t *p_intf )
 /*****************************************************************************
  * RunInterface: setups necessary data and give control to the interface
  *****************************************************************************/
-static void RunInterface( intf_thread_t *p_intf )
+static void* RunInterface( vlc_object_t *p_this )
 {
+    intf_thread_t *p_intf = (intf_thread_t *)p_this;
     vlc_value_t val, text;
     char *psz_intf;
+    int canc = vlc_savecancel ();
 
     /* Variable used for interface spawning */
     var_Create( p_intf, "intf-add", VLC_VAR_STRING |
@@ -193,7 +206,8 @@ static void RunInterface( intf_thread_t *p_intf )
     text.psz_string = _("Add Interface");
     var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL );
 
-    val.psz_string = (char *)"rc"; text.psz_string = (char *)"Console";
+    val.psz_string = (char *)"rc";
+    text.psz_string = (char *)_("Console");
     var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
     val.psz_string = (char *)"telnet";
     text.psz_string = (char *)_("Telnet Interface");
@@ -235,17 +249,58 @@ static void RunInterface( intf_thread_t *p_intf )
         psz_intf = p_intf->psz_switch_intf;
         p_intf->psz_switch_intf = NULL;
 
-        vlc_mutex_lock( &p_intf->object_lock );
+        vlc_object_lock( p_intf );
         p_intf->b_die = false; /* FIXME */
         p_intf->b_dead = false;
 
-        vlc_mutex_unlock( &p_intf->object_lock );
+        vlc_object_unlock( p_intf );
 
         p_intf->psz_intf = psz_intf;
         p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
     }
     while( p_intf->p_module );
+
+    vlc_restorecancel (canc);
+    return NULL;
+}
+
+#ifdef __APPLE__
+/*****************************************************************************
+ * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
+ *****************************************************************************/
+static void * MonitorLibVLCDeath( vlc_object_t * p_this )
+{
+    intf_thread_t *p_intf = (intf_thread_t *)p_this;
+    libvlc_int_t * p_libvlc = p_intf->p_libvlc;
+    int canc = vlc_savecancel ();
+
+    vlc_object_lock( p_libvlc );
+    while(vlc_object_alive( p_libvlc ) )
+    {
+        if(p_intf->b_die)
+        {
+            vlc_object_unlock( p_libvlc );
+            return NULL;
+        }
+        vlc_object_wait( p_libvlc );
+    }
+    vlc_object_unlock( p_libvlc );
+
+    /* Someone killed libvlc */
+
+    /* Make sure we kill all interface objects, especially
+     * those that are blocking libvlc (running on main thread) */
+    vlc_list_t * p_list = vlc_list_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD );
+    for( int i = 0; i < p_list->i_count; i++ )
+    {
+        vlc_object_t * p_intf = p_list->p_values[i].p_object;
+        vlc_object_kill( p_intf );
+    }
+    vlc_list_release( p_list );
+    vlc_restorecancel (canc);
+    return NULL;
 }
+#endif
 
 static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )