Commit 4dc0b22b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove b_should_run_on_first_thread

parent a11c642f
...@@ -53,10 +53,6 @@ typedef struct intf_thread_t ...@@ -53,10 +53,6 @@ typedef struct intf_thread_t
struct intf_thread_t *p_next; /** LibVLC interfaces book keeping */ struct intf_thread_t *p_next; /** LibVLC interfaces book keeping */
vlc_thread_t thread; /** LibVLC thread */ vlc_thread_t thread; /** LibVLC thread */
/* Thread properties and locks */
#if defined( __APPLE__ )
bool b_should_run_on_first_thread;
#endif
/* Specific interfaces */ /* Specific interfaces */
intf_sys_t * p_sys; /** system interface */ intf_sys_t * p_sys; /** system interface */
......
...@@ -106,11 +106,6 @@ int intf_Create( vlc_object_t *p_this, const char *chain ) ...@@ -106,11 +106,6 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL ); var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
/* Attach interface to LibVLC */
#if defined( __APPLE__ )
p_intf->b_should_run_on_first_thread = false;
#endif
/* Choose the best module */ /* Choose the best module */
p_intf->p_cfg = NULL; p_intf->p_cfg = NULL;
char *psz_parser = *chain == '$' char *psz_parser = *chain == '$'
...@@ -129,17 +124,6 @@ int intf_Create( vlc_object_t *p_this, const char *chain ) ...@@ -129,17 +124,6 @@ int intf_Create( vlc_object_t *p_this, const char *chain )
goto error; goto error;
} }
#if defined( __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 )
{
libvlc_SetExitHandler( p_libvlc, vlc_object_kill, p_intf );
assert( p_intf->pf_run );
p_intf->pf_run( p_intf );
}
else
#endif
/* Run the interface in a separate thread */ /* Run the interface in a separate thread */
if( p_intf->pf_run if( p_intf->pf_run
&& vlc_clone( &p_intf->thread, && vlc_clone( &p_intf->thread,
...@@ -192,9 +176,6 @@ void intf_DestroyAll( libvlc_int_t *p_libvlc ) ...@@ -192,9 +176,6 @@ void intf_DestroyAll( libvlc_int_t *p_libvlc )
if( p_intf->pf_run ) if( p_intf->pf_run )
{ {
vlc_cancel( p_intf->thread ); vlc_cancel( p_intf->thread );
#ifdef __APPLE__
if (!p_intf->b_should_run_on_first_thread)
#endif
vlc_join( p_intf->thread, NULL ); vlc_join( p_intf->thread, NULL );
} }
module_unneed( p_intf, p_intf->p_module ); module_unneed( p_intf, p_intf->p_module );
......
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