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

Use libvlc_InternalWait

parent 2e685724
...@@ -184,10 +184,7 @@ void libvlc_add_intf( libvlc_instance_t *p_i, const char *name, ...@@ -184,10 +184,7 @@ void libvlc_add_intf( libvlc_instance_t *p_i, const char *name,
void libvlc_wait( libvlc_instance_t *p_i ) void libvlc_wait( libvlc_instance_t *p_i )
{ {
libvlc_int_t *p_libvlc = p_i->p_libvlc_int; libvlc_int_t *p_libvlc = p_i->p_libvlc_int;
vlc_object_lock( p_libvlc ); libvlc_InternalWait( p_libvlc );
while( vlc_object_alive( p_libvlc ) )
vlc_object_wait( p_libvlc );
vlc_object_unlock( p_libvlc );
} }
int libvlc_get_vlc_id( libvlc_instance_t *p_instance ) int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
......
...@@ -240,10 +240,7 @@ static void * MonitorLibVLCDeath( vlc_object_t * p_this ) ...@@ -240,10 +240,7 @@ static void * MonitorLibVLCDeath( vlc_object_t * p_this )
libvlc_int_t * p_libvlc = p_intf->p_libvlc; libvlc_int_t * p_libvlc = p_intf->p_libvlc;
int canc = vlc_savecancel (); int canc = vlc_savecancel ();
vlc_object_lock( p_libvlc ); libvlc_InternalWait( p_libvlc );
while( vlc_object_alive( p_libvlc ) )
vlc_object_wait( p_libvlc );
vlc_object_unlock( p_libvlc );
vlc_object_kill( p_intf ); /* Kill the stupid first thread interface */ vlc_object_kill( p_intf ); /* Kill the stupid first thread interface */
vlc_restorecancel (canc); vlc_restorecancel (canc);
......
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