X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fsap.c;h=d0d1144e99bf74ba613769876a6b7fa40e6cf20f;hb=d7a21b12e9dc5e883e2401faa817fdf211372626;hp=58d2819e4c98bc99f4ab423868bb5d9f10f80659;hpb=54eff3ece763ace8cbfa3120913c9e77f23c14d6;p=vlc

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 58d2819e4c..d0d1144e99 100644
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -34,8 +34,8 @@
 #include <vlc_plugin.h>
 #include <assert.h>
 
-#include <vlc_playlist.h>
 #include <vlc_demux.h>
+#include <vlc_services_discovery.h>
 
 #include <vlc_network.h>
 #include <vlc_charset.h>
@@ -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_( \
@@ -227,7 +227,7 @@ struct sap_announce_t
     /* SAP annnounces must only contain one SDP */
     sdp_t       *p_sdp;
 
-    int i_input_id;
+    input_item_t * p_item;
 };
 
 struct services_discovery_sys_t
@@ -547,10 +547,8 @@ static void Run( services_discovery_t *p_sd )
 
     psz_addr = var_CreateGetString( p_sd, "sap-addr" );
     if( psz_addr && *psz_addr )
-    {
         InitSocket( p_sd, psz_addr, SAP_PORT );
-        free( psz_addr );
-    }
+    free( psz_addr );
 
     if( p_sd->p_sys->i_fd == 0 )
     {
@@ -662,7 +660,6 @@ static int Demux( demux_t *p_demux )
     input_thread_t *p_input;
     input_item_t *p_parent_input;
 
-    playlist_t *p_playlist = pl_Yield( p_demux );
     p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT,
                                                  FIND_PARENT );
     assert( p_input );
@@ -672,6 +669,8 @@ static int Demux( demux_t *p_demux )
         return VLC_EGENERIC;
     }
 
+    /* This item hasn't been yield by input_GetItem
+     * don't release it */
     p_parent_input = input_GetItem( p_input );
 
     input_item_SetURI( p_parent_input, p_sdp->psz_uri );
@@ -681,17 +680,7 @@ static int Demux( demux_t *p_demux )
 
     p_parent_input->i_type = ITEM_TYPE_NET;
 
-    if( p_playlist->status.p_item &&
-             p_playlist->status.p_item->p_input == p_parent_input )
-    {
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
-                          p_playlist->status.p_node, p_playlist->status.p_item );
-    }
-
     vlc_mutex_unlock( &p_parent_input->lock );
-    vlc_object_release( p_input );
-    vlc_object_release( p_playlist );
-
     return VLC_SUCCESS;
 }
 
@@ -880,12 +869,12 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash,
     p_sap->i_hash = i_hash;
     p_sap->p_sdp = p_sdp;
 
-    /* Create the actual playlist item here */
+    /* Released in RemoveAnnounce */
     p_input = input_ItemNewWithType( VLC_OBJECT(p_sd),
                                      p_sap->p_sdp->psz_uri,
                                      p_sdp->psz_sessionname,
                                      0, NULL, -1, ITEM_TYPE_NET );
-    p_sap->i_input_id = p_input->i_id;
+    p_sap->p_item = p_input;
     if( !p_input )
     {
         free( p_sap );
@@ -915,7 +904,7 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash,
     services_discovery_AddItem( p_sd, p_input, psz_value /* category name */ );
 
     TAB_APPEND( p_sys->i_announces, p_sys->pp_announces, p_sap );
-    vlc_gc_decref( p_input );
+
     return p_sap;
 }
 
@@ -1537,11 +1526,11 @@ static int RemoveAnnounce( services_discovery_t *p_sd,
         p_announce->p_sdp = NULL;
     }
 
-    if( p_announce->i_input_id > -1 )
+    if( p_announce->p_item )
     {
-        playlist_DeleteFromInput( pl_Yield( p_sd ),
-                                  p_announce->i_input_id, false );
-        pl_Release( p_sd );
+        services_discovery_RemoveItem( p_sd, p_announce->p_item );
+        vlc_gc_decref( p_announce->p_item );
+        p_announce->p_item = NULL;
     }
 
     for( i = 0; i< p_sd->p_sys->i_announces; i++)