X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fservices_discovery.c;h=76ce11dc5588f04348ad503b4131bcf23338289a;hb=a106e0a3bcf439dd278f12c53254870f5cf358c3;hp=d938c437abb64c57b44f177f63f63a9b05496191;hpb=bb5a8eb81e72432957f7dc0de32a9ae440884f62;p=vlc

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index d938c437ab..76ce11dc55 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -25,10 +25,11 @@
 #endif
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "vlc_events.h"
 #include "playlist_internal.h"
+#include "../libvlc.h"
 
 static void RunSD( services_discovery_t *p_sd );
 
@@ -74,7 +75,7 @@ services_discovery_Create ( vlc_object_t * p_super, const char * psz_module_name
     vlc_event_manager_register_event_type( &p_sd->event_manager,
             vlc_ServicesDiscoveryEnded );
 
-    p_sd->p_module = module_Need( p_sd, "services_discovery", psz_module_name, VLC_TRUE );
+    p_sd->p_module = module_Need( p_sd, "services_discovery", psz_module_name, true );
 
     if( p_sd->p_module == NULL )
     {
@@ -83,7 +84,7 @@ services_discovery_Create ( vlc_object_t * p_super, const char * psz_module_name
         return NULL;
     }
     p_sd->psz_module = strdup( psz_module_name );
-    p_sd->b_die = VLC_FALSE; /* FIXME */
+    p_sd->b_die = false; /* FIXME */
 
     vlc_object_attach( p_sd, p_super );
     return p_sd;
@@ -110,7 +111,7 @@ int services_discovery_Start ( services_discovery_t * p_sd )
 {
     if ((p_sd->pf_run != NULL)
         && vlc_thread_create( p_sd, "services_discovery", RunSD,
-                              VLC_THREAD_PRIORITY_LOW, VLC_FALSE))
+                              VLC_THREAD_PRIORITY_LOW, false))
     {
         msg_Err( p_sd, "cannot create services discovery thread" );
         vlc_object_release( p_sd );
@@ -122,9 +123,21 @@ int services_discovery_Start ( services_discovery_t * p_sd )
 /***********************************************************************
  * Stop
  ***********************************************************************/
+static void ObjectKillChildrens( vlc_object_t *p_obj )
+{
+    vlc_list_t *p_list;
+    int i;
+    vlc_object_kill( p_obj );
+
+    p_list = vlc_list_children( p_obj );
+    for( i = 0; i < p_list->i_count; i++ )
+        ObjectKillChildrens( p_list->p_values[i].p_object );
+    vlc_list_release( p_list );
+}
+
 void services_discovery_Stop ( services_discovery_t * p_sd )
 {
-    vlc_object_kill( p_sd );
+    ObjectKillChildrens( VLC_OBJECT(p_sd) );
     if( p_sd->pf_run ) vlc_thread_join( p_sd );
 
     module_Unneed( p_sd, p_sd->p_module );
@@ -213,34 +226,37 @@ static void playlist_sd_item_added( const vlc_event_t * p_event, void * user_dat
     input_item_t * p_input = p_event->u.services_discovery_item_added.p_new_item;
     const char * psz_cat = p_event->u.services_discovery_item_added.psz_category;
     playlist_item_t *p_new_item, * p_parent = user_data;
+    playlist_t * p_playlist = p_parent->p_playlist;
 
-    msg_Dbg( p_parent->p_playlist, "Adding %s in %s",
+    msg_Dbg( p_playlist, "Adding %s in %s",
                 p_input->psz_name ? p_input->psz_name : "(null)",
                 psz_cat ? psz_cat : "(null)" );
 
+    PL_LOCK;
     /* If p_parent is in root category (this is clearly a hack) and we have a cat */
     if( !EMPTY_STR(psz_cat) &&
-        p_parent->p_parent == p_parent->p_playlist->p_root_category )
+        p_parent->p_parent == p_playlist->p_root_category )
     {
         /* */
         playlist_item_t * p_cat;
         p_cat = playlist_ChildSearchName( p_parent, psz_cat );
         if( !p_cat )
         {
-            p_cat = playlist_NodeCreate( p_parent->p_playlist, psz_cat,
+            p_cat = playlist_NodeCreate( p_playlist, psz_cat,
                                          p_parent, 0, NULL );
             p_cat->i_flags &= ~PLAYLIST_SKIP_FLAG;
         }
         p_parent = p_cat;
     }
 
-    p_new_item = playlist_NodeAddInput( p_parent->p_playlist, p_input, p_parent,
-                                        PLAYLIST_APPEND, PLAYLIST_END, VLC_FALSE );
+    p_new_item = playlist_NodeAddInput( p_playlist, p_input, p_parent,
+                                        PLAYLIST_APPEND, PLAYLIST_END, pl_Locked );
     if( p_new_item )
     {
         p_new_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
         p_new_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
     }
+    PL_UNLOCK;
 }
 
  /* A new item has been removed from a certain sd */
@@ -254,19 +270,20 @@ static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_d
      * XXX: Why don't we have a function to ensure that in the playlist code ? */
     vlc_object_lock( p_parent->p_playlist );
     p_pl_item = playlist_ItemFindFromInputAndRoot( p_parent->p_playlist,
-            p_input->i_id, p_parent, VLC_FALSE );
+            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, VLC_TRUE, VLC_FALSE );
+        playlist_NodeDelete( p_parent->p_playlist, p_pl_item, true, false );
         vlc_object_unlock( p_parent->p_playlist );
         return;
     }
-    vlc_object_unlock( p_parent->p_playlist );
 
     /* Delete the non-node item normally */
-    playlist_DeleteInputInParent( p_parent->p_playlist, p_input->i_id,
-                                  p_parent, VLC_FALSE );
+    playlist_DeleteFromInputInParent( p_parent->p_playlist, p_input->i_id,
+                                      p_parent, pl_Locked );
+
+    vlc_object_unlock( p_parent->p_playlist );
 }
 
 int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,  const char *psz_modules )
@@ -305,8 +322,10 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,  const char *psz_modu
 
         char * psz = services_discovery_GetLocalizedName( p_sd );
         assert( psz );
+        PL_LOCK;
         playlist_NodesPairCreate( p_playlist, psz,
-                &p_cat, &p_one, VLC_FALSE );
+                &p_cat, &p_one, false );
+        PL_UNLOCK;
         free( psz );
 
         vlc_event_attach( services_discovery_EventManager( p_sd ),
@@ -334,10 +353,7 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,  const char *psz_modu
         /* Free in playlist_ServicesDiscoveryRemove */
         p_sds = malloc( sizeof(struct playlist_services_discovery_support_t) );
         if( !p_sds )
-        {
-            msg_Err( p_playlist, "No more memory" );
             return VLC_ENOMEM;
-        }
         p_sds->p_sd = p_sd;
         p_sds->p_one = p_one;
         p_sds->p_cat = p_cat;
@@ -401,17 +417,18 @@ int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist,
     if( p_sds->p_cat != p_playlist->p_root_category &&
         p_sds->p_one != p_playlist->p_root_onelevel )
     {
-        playlist_NodeDelete( p_playlist, p_sds->p_cat, VLC_TRUE, VLC_FALSE );
-        playlist_NodeDelete( p_playlist, p_sds->p_one, VLC_TRUE, VLC_FALSE );
+        playlist_NodeDelete( p_playlist, p_sds->p_cat, true, false );
+        playlist_NodeDelete( p_playlist, p_sds->p_one, true, false );
     }
     PL_UNLOCK;
 
     services_discovery_Destroy( p_sds->p_sd );
+    free( p_sds );
 
     return VLC_SUCCESS;
 }
 
-vlc_bool_t playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist,
+bool playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist,
                                               const char *psz_module )
 {
     int i;
@@ -422,10 +439,17 @@ vlc_bool_t playlist_IsServicesDiscoveryLoaded( playlist_t * p_playlist,
         if( !strcmp( psz_module, p_playlist->pp_sds[i]->p_sd->psz_module ) )
         {
             PL_UNLOCK;
-            return VLC_TRUE;
+            return true;
         }
     }
     PL_UNLOCK;
-    return VLC_FALSE;
+    return false;
+}
+
+void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist )
+{
+    while( p_playlist->i_sds > 0 )
+        playlist_ServicesDiscoveryRemove( p_playlist,
+                                     p_playlist->pp_sds[0]->p_sd->psz_module );
 }