Commit 93143da0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove useless MonitorLibVLCDeath() contorsion

parent 02a2074e
...@@ -134,19 +134,9 @@ int intf_Create( vlc_object_t *p_this, const char *chain ) ...@@ -134,19 +134,9 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
* (it needs access to the main thread) */ * (it needs access to the main thread) */
if( p_intf->b_should_run_on_first_thread ) if( p_intf->b_should_run_on_first_thread )
{ {
if( vlc_clone( &p_intf->thread, libvlc_SetExitHandler( p_libvlc, vlc_object_kill, p_intf );
MonitorLibVLCDeath, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
goto error;
}
assert( p_intf->pf_run ); assert( p_intf->pf_run );
p_intf->pf_run( p_intf ); p_intf->pf_run( p_intf );
/* It is monitoring libvlc, not the p_intf */
vlc_object_kill( p_intf->p_libvlc );
vlc_join( p_intf->thread, NULL );
} }
else else
#endif #endif
...@@ -230,27 +220,6 @@ static void* RunInterface( void *p_this ) ...@@ -230,27 +220,6 @@ static void* RunInterface( void *p_this )
return NULL; return NULL;
} }
#if defined( __APPLE__ )
#include "../lib/libvlc_internal.h" /* libvlc_InternalWait */
/**
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
*
* @param p_this: the interface object
*/
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 ();
libvlc_InternalWait( p_libvlc );
vlc_object_kill( p_intf ); /* Kill the stupid first thread interface */
vlc_restorecancel (canc);
return NULL;
}
#endif
static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd, static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data ) vlc_value_t oldval, vlc_value_t newval, void *p_data )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment