Skip to content

V
vlc-gpu
Commit e75b95ed authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

SD: use playlist_Lock explicitly

parent 62f99c5c
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
src/playlist/services_discovery.c
View file @ e75b95ed
...@@ -211,22 +211,18 @@ static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_d ...@@ -211,22 +211,18 @@ static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_d
/* First make sure that if item is a node it will be deleted. /* First make sure that if item is a node it will be deleted.
* XXX: Why don't we have a function to ensure that in the playlist code ? */ * XXX: Why don't we have a function to ensure that in the playlist code ? */
vlc_object_lock( p_parent->p_playlist ); playlist_Lock( p_parent->p_playlist );
p_pl_item = playlist_ItemFindFromInputAndRoot( p_parent->p_playlist, p_pl_item = playlist_ItemFindFromInputAndRoot( p_parent->p_playlist,
p_input->i_id, p_parent, false ); p_input->i_id, p_parent, false );
if( p_pl_item && p_pl_item->i_children > -1 ) if( p_pl_item && p_pl_item->i_children > -1 )
{
playlist_NodeDelete( p_parent->p_playlist, p_pl_item, true, false ); playlist_NodeDelete( p_parent->p_playlist, p_pl_item, true, false );
vlc_object_unlock( p_parent->p_playlist ); else
return;
}
/* Delete the non-node item normally */ /* Delete the non-node item normally */
playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input->i_id, playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input->i_id,
p_parent, pl_Locked ); p_parent, pl_Locked );
vlc_object_unlock( p_parent->p_playlist ); playlist_Unlock( p_parent->p_playlist );
} }
int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_module ) int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_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