DeleteInner() : remove deleted items from current items array

[vlc] / src / playlist / services_discovery.c

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index cdbbeb22cbad1c0b233361c5327cd86ed4db5f95..57d8928501001a05cb04402ef657ff9369a0b303 100644 (file)
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -33,6 +33,8 @@
 #include "../libvlc.h"
 
 
+static void services_discovery_Destructor ( vlc_object_t *p_obj );
+
 /*
  * Services discovery
  * Basically you just listen to Service discovery event through the
@@ -71,6 +73,7 @@ services_discovery_t *vlc_sd_Create( vlc_object_t *p_super )
     vlc_event_manager_register_event_type( &p_sd->event_manager,
             vlc_ServicesDiscoveryEnded );
 
+    vlc_object_set_destructor( p_sd, services_discovery_Destructor );
     vlc_object_attach( p_sd, p_super );
 
     return p_sd;
@@ -113,6 +116,16 @@ void vlc_sd_Stop ( services_discovery_t * p_sd )
     p_sd->p_module = NULL;
 }
 
+/***********************************************************************
+ * Destructor
+ ***********************************************************************/
+static void services_discovery_Destructor ( vlc_object_t *p_obj )
+{
+    services_discovery_t * p_sd = (services_discovery_t *)p_obj;
+    assert(!p_sd->p_module); /* Forgot to call Stop */
+    vlc_event_manager_fini( &p_sd->event_manager );
+}
+
 /***********************************************************************
  * GetLocalizedName
  ***********************************************************************/
@@ -211,22 +224,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 );
+            p_input, 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,
+                                          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 )
@@ -238,7 +247,7 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_modul
     if( !p_sd )
         return VLC_ENOMEM;
 
-    module_t *m = module_find( psz_module );
+    module_t *m = module_find_by_shortcut( psz_module );
     if( !m )
     {
         msg_Err( p_playlist, "No such module: %s", psz_module );
@@ -293,6 +302,7 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_modul
     p_sds->p_sd = p_sd;
     p_sds->p_one = p_one;
     p_sds->p_cat = p_cat;
+    p_sds->psz_name = strdup( psz_module );
 
     PL_LOCK;
     TAB_APPEND( pl_priv(p_playlist)->i_sds, pl_priv(p_playlist)->pp_sds, p_sds );
@@ -302,18 +312,18 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist, const char *psz_modul
 }
 
 int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist,
-                                      const char *psz_module )
+                                      const char *psz_name )
 {
+    playlist_private_t *priv = pl_priv( p_playlist );
     struct playlist_services_discovery_support_t * p_sds = NULL;
-    int i;
 
     PL_LOCK;
-    for( i = 0 ; i< pl_priv(p_playlist)->i_sds ; i ++ )
+    for( int i = 0; i < priv->i_sds; i++ )
     {
-        if( !strcmp( psz_module, module_get_object( pl_priv(p_playlist)->pp_sds[i]->p_sd->p_module ) ) )
+        if( !strcmp( psz_name, priv->pp_sds[i]->psz_name ) )
         {
-            p_sds = pl_priv(p_playlist)->pp_sds[i];
-            REMOVE_ELEM( pl_priv(p_playlist)->pp_sds, pl_priv(p_playlist)->i_sds, i );
+            p_sds = priv->pp_sds[i];
+            REMOVE_ELEM( priv->pp_sds, priv->i_sds, i );
             break;
         }
     }
@@ -321,7 +331,7 @@ int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist,
 
     if( !p_sds )
     {
-        msg_Warn( p_playlist, "module %s is not loaded", psz_module );
+        msg_Warn( p_playlist, "discovery %s is not loaded", psz_name );
         return VLC_EGENERIC;
     }
 
@@ -361,32 +371,38 @@ int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist,
     PL_UNLOCK;
 
     vlc_sd_Destroy( p_sd );
+    free( p_sds->psz_name );
     free( p_sds );
 
     return VLC_SUCCESS;
 }
 
 bool playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist,
-                                              const char *psz_module )
+                                         const char *psz_name )
 {
-    int i;
+    playlist_private_t *priv = pl_priv( p_playlist );
+    bool found = false;
     PL_LOCK;
 
-    for( i = 0 ; i< pl_priv(p_playlist)->i_sds ; i ++ )
+    for( int i = 0; i < priv->i_sds; i++ )
     {
-        if( !strcmp( psz_module, module_get_object( pl_priv(p_playlist)->pp_sds[i]->p_sd->p_module ) ) )
+        vlc_sd_internal_t *sd = priv->pp_sds[i];
+
+        if( sd->psz_name && !strcmp( psz_name, sd->psz_name ) )
         {
-            PL_UNLOCK;
-            return true;
+            found = true;
+            break;
         }
     }
     PL_UNLOCK;
-    return false;
+    return found;
 }
 
 void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist )
 {
-    while( pl_priv(p_playlist)->i_sds > 0 )
+    playlist_private_t *priv = pl_priv( p_playlist );
+
+    while( priv->i_sds > 0 )
         playlist_ServicesDiscoveryRemove( p_playlist,
-                                          module_get_object( pl_priv(p_playlist)->pp_sds[0]->p_sd->p_module ) );
+                                          priv->pp_sds[0]->psz_name );
 }