[vlc-devel] commit: SD: use playlist_Lock explicitly ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Mar  4 23:06:08 2009 +0200| [e75b95eda5d14b79c94acecb964032871cd74b4b] | committer: Rémi Denis-Courmont 

SD: use playlist_Lock explicitly

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e75b95eda5d14b79c94acecb964032871cd74b4b
---

 src/playlist/services_discovery.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 36a297e..ab69fb5 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -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.
      * 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_input->i_id, p_parent, false );
 
     if( p_pl_item && p_pl_item->i_children > -1 )
-    {
         playlist_NodeDelete( p_parent->p_playlist, p_pl_item, true, false );
-        vlc_object_unlock( p_parent->p_playlist );
-        return;
-    }
-
-    /* Delete the non-node item normally */
-    playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input->i_id,
-                                      p_parent, pl_Locked );
+    else
+        /* Delete the non-node item normally */
+        playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input->i_id,
+                                          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 )