Use pl_Locked and pl_Unlocked.

[vlc] / modules / services_discovery / sap.c

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 58d2819e4c98bc99f4ab423868bb5d9f10f80659..ff84a13a4ab1743d859d00d2e628f25a58f6f0da 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -102,7 +102,7 @@
 #define SAP_PARSE_TEXT N_( "Try to parse the announce" )
 #define SAP_PARSE_LONGTEXT N_( \
        "This enables actual parsing of the announces by the SAP module. " \
-       "Otherwise, all announcements are parsed by the \"livedotcom\" " \
+       "Otherwise, all announcements are parsed by the \"live555\" " \
        "(RTP/RTSP) module." )
 #define SAP_STRICT_TEXT N_( "SAP Strict mode" )
 #define SAP_STRICT_LONGTEXT N_( \
@@ -684,7 +684,7 @@ static int Demux( demux_t *p_demux )
     if( p_playlist->status.p_item &&
              p_playlist->status.p_item->p_input == p_parent_input )
     {
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
                           p_playlist->status.p_node, p_playlist->status.p_item );
     }
 
@@ -1540,7 +1540,7 @@ static int RemoveAnnounce( services_discovery_t *p_sd,
     if( p_announce->i_input_id > -1 )
     {
         playlist_DeleteFromInput( pl_Yield( p_sd ),
-                                  p_announce->i_input_id, false );
+                                  p_announce->i_input_id, pl_Unlocked );
         pl_Release( p_sd );
     }