Translate Console.

[vlc] / src / interface / interface.c

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 5de0c7122fcdd189bb5509e969aef93379009f46..e6349841b568db19c93ca4c365fdab7a64e85b5d 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -50,8 +50,9 @@
  * Local prototypes
  *****************************************************************************/
 static void RunInterface( intf_thread_t *p_intf );
+#ifdef __APPLE__
 static void MonitorLibVLCDeath( intf_thread_t *p_intf );
-
+#endif
 static int AddIntfCallback( vlc_object_t *, char const *,
                             vlc_value_t , vlc_value_t , void * );
 
@@ -95,7 +96,9 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
     if( !p_intf )
         return 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 );
@@ -136,6 +139,7 @@ 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 )
@@ -147,11 +151,18 @@ int intf_RunThread( intf_thread_t *p_intf )
             return VLC_EGENERIC;
         }
         RunInterface( 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 ) )
@@ -193,7 +204,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");
@@ -247,6 +259,7 @@ static void RunInterface( intf_thread_t *p_intf )
     while( p_intf->p_module );
 }
 
+#ifdef __APPLE__
 /*****************************************************************************
  * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
  *****************************************************************************/
@@ -255,7 +268,14 @@ 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 ) )
+    {
+        if(p_intf->b_die)
+        {
+            vlc_object_unlock( p_libvlc );
+            return;
+        }
         vlc_object_wait( p_libvlc );
+    }
     vlc_object_unlock( p_libvlc );
 
     /* Someone killed libvlc */
@@ -269,8 +289,8 @@ static void MonitorLibVLCDeath( intf_thread_t *p_intf )
         vlc_object_kill( p_intf );
     }
     vlc_list_release( p_list );
-
 }
+#endif
 
 static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )