/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void RunInterface( intf_thread_t *p_intf );
-static void MonitorLibVLCDeath( 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 * );
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 );
*/
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 )
msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
return VLC_EGENERIC;
}
- RunInterface( p_intf );
+ 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 ) )
/*****************************************************************************
* 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 |
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");
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( intf_thread_t *p_intf )
+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 */
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 )