[vlc-devel] commit: interface: Make sure that when b_should_run_on_first_thread is set the interface gets killed by vlc_object_kill ( p_libvlc ). (Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sat Jul  5 02:42:10 2008 +0200| [a8fe5f4ab123b90a557d5d7a4172d19325929367]

interface: Make sure that when b_should_run_on_first_thread is set the interface gets killed by vlc_object_kill( p_libvlc ).

This fixes Ctrl-C on Mac OS X.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a8fe5f4ab123b90a557d5d7a4172d19325929367
---

 src/interface/interface.c |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/src/interface/interface.c b/src/interface/interface.c
index c30bac5..5de0c71 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -50,6 +50,7 @@
  * Local prototypes
  *****************************************************************************/
 static void RunInterface( intf_thread_t *p_intf );
+static void MonitorLibVLCDeath( intf_thread_t *p_intf );
 
 static int AddIntfCallback( vlc_object_t *, char const *,
                             vlc_value_t , vlc_value_t , void * );
@@ -139,6 +140,12 @@ int intf_RunThread( intf_thread_t *p_intf )
      * (it needs access to the main thread) */
     if( p_intf->b_should_run_on_first_thread )
     {
+        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( p_intf );
         vlc_object_detach( p_intf );
         vlc_object_release( p_intf );
@@ -240,6 +247,31 @@ static void RunInterface( intf_thread_t *p_intf )
     while( p_intf->p_module );
 }
 
+/*****************************************************************************
+ * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
+ *****************************************************************************/
+static void MonitorLibVLCDeath( intf_thread_t *p_intf )
+{
+    libvlc_int_t * p_libvlc = p_intf->p_libvlc;
+    vlc_object_lock( p_libvlc );
+    while(vlc_object_alive( p_libvlc ) )
+        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 );
+
+}
+
 static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {