[vlc-devel] [PATCH] service_discovery: Consistently use playlist_Lock/Unlock

[Marvin Scholz]

---
 src/playlist/services_discovery.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index d041c728b2..0c76095657 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -85,12 +85,12 @@ static void playlist_sd_item_removed(services_discovery_t *sd,
 
     msg_Dbg(sd, "removing sd item: %s", p_input->psz_name ? p_input->psz_name : "(null)");
 
-    PL_LOCK;
+    playlist_Lock(p_playlist);
     item = playlist_ItemGetByInput(p_playlist, p_input);
     if (unlikely(item == NULL))
     {
         msg_Err(sd, "removing sd item not added"); /* SD plugin bug */
-        PL_UNLOCK;
+        playlist_Unlock(p_playlist);
         return;
     }
 
@@ -107,7 +107,7 @@ static void playlist_sd_item_removed(services_discovery_t *sd,
         item = node;
     playlist_NodeDeleteExplicit(p_playlist, item,
         PLAYLIST_DELETE_FORCE | PLAYLIST_DELETE_STOP_IF_CURRENT );
-    PL_UNLOCK;
+    playlist_Unlock(p_playlist);
 }
 
 int playlist_ServicesDiscoveryAdd(playlist_t *playlist, const char *chain)
@@ -198,7 +198,7 @@ bool playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist,
 {
     playlist_private_t *priv = pl_priv( p_playlist );
     bool found = false;
-    PL_LOCK;
+    playlist_Lock(p_playlist);
 
     for( int i = 0; i < priv->i_sds; i++ )
     {
@@ -210,7 +210,7 @@ bool playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist,
             break;
         }
     }
-    PL_UNLOCK;
+    playlist_Unlock(p_playlist);
     return found;
 }
 
@@ -220,7 +220,7 @@ int playlist_ServicesDiscoveryControl( playlist_t *p_playlist, const char *psz_n
     int i_ret = VLC_EGENERIC;
     int i;
 
-    PL_LOCK;
+    playlist_Lock(p_playlist);
     for( i = 0; i < priv->i_sds; i++ )
     {
         vlc_sd_internal_t *sds = priv->pp_sds[i];
@@ -235,7 +235,7 @@ int playlist_ServicesDiscoveryControl( playlist_t *p_playlist, const char *psz_n
     }
 
     assert( i != priv->i_sds );
-    PL_UNLOCK;
+    playlist_Unlock(p_playlist);
 
     return i_ret;
 }
-- 
2.11.0 (Apple Git-81)