Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / playlist / services_discovery.c

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index fe6bfde9b15bb577b6db689069023e2a3ca01e72..2f384e679add18ac2eeae47aa8a795025e636b62 100644 (file)
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -30,6 +30,7 @@
 #include "vlc_events.h"
 #include <vlc_services_discovery.h>
 #include <vlc_probe.h>
+#include <vlc_modules.h>
 #include "playlist_internal.h"
 #include "../libvlc.h"
 
@@ -93,14 +94,6 @@ char **vlc_sd_GetNames (vlc_object_t *obj, char ***pppsz_longnames, int **pp_cat
 }
 
 
-struct vlc_sd_internal_t
-{
-    /* the playlist items for category and onelevel */
-    playlist_item_t      *p_node;
-    services_discovery_t *p_sd; /**< Loaded service discovery modules */
-    char                 *psz_name;
-};
-
 static void services_discovery_Destructor ( vlc_object_t *p_obj );
 
 /*
@@ -124,15 +117,12 @@ services_discovery_t *vlc_sd_Create( vlc_object_t *p_super,
         return NULL;
     free(config_ChainCreate( &p_sd->psz_name, &p_sd->p_cfg, cfg ));
 
-    vlc_event_manager_init( &p_sd->event_manager, p_sd, (vlc_object_t *)p_sd );
-    vlc_event_manager_register_event_type( &p_sd->event_manager,
-            vlc_ServicesDiscoveryItemAdded );
-    vlc_event_manager_register_event_type( &p_sd->event_manager,
-            vlc_ServicesDiscoveryItemRemoved );
-    vlc_event_manager_register_event_type( &p_sd->event_manager,
-            vlc_ServicesDiscoveryStarted );
-    vlc_event_manager_register_event_type( &p_sd->event_manager,
-            vlc_ServicesDiscoveryEnded );
+    vlc_event_manager_t *em = &p_sd->event_manager;
+    vlc_event_manager_init( em, p_sd, (vlc_object_t *)p_sd );
+    vlc_event_manager_register_event_type(em, vlc_ServicesDiscoveryItemAdded);
+    vlc_event_manager_register_event_type(em, vlc_ServicesDiscoveryItemRemoved);
+    vlc_event_manager_register_event_type(em, vlc_ServicesDiscoveryStarted);
+    vlc_event_manager_register_event_type(em, vlc_ServicesDiscoveryEnded);
 
     vlc_object_set_destructor( p_sd, services_discovery_Destructor );
     vlc_object_attach( p_sd, p_super );
@@ -244,6 +234,14 @@ services_discovery_RemoveItem ( services_discovery_t * p_sd, input_item_t * p_it
  * Playlist - Services discovery bridge
  */
 
+struct vlc_sd_internal_t
+{
+    /* the playlist items for category and onelevel */
+    playlist_item_t      *p_node;
+    services_discovery_t *p_sd; /**< Loaded service discovery modules */
+    char                 *psz_name;
+};
+
  /* A new item has been added to a certain sd */
 static void playlist_sd_item_added( const vlc_event_t * p_event, void * user_data )
 {
@@ -266,7 +264,7 @@ static void playlist_sd_item_added( const vlc_event_t * p_event, void * user_dat
         if( !p_cat )
         {
             p_cat = playlist_NodeCreate( p_playlist, psz_cat,
-                                         p_parent, 0, NULL );
+                                         p_parent, PLAYLIST_END, 0, NULL );
             p_cat->i_flags &= ~PLAYLIST_SKIP_FLAG;
         }
         p_parent = p_cat;
@@ -342,15 +340,14 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,
 
     PL_LOCK;
     p_node = playlist_NodeCreate( p_playlist, psz_longname,
-                                  p_playlist->p_root, 0, NULL );
+                                  p_playlist->p_root, PLAYLIST_END, 0, NULL );
     PL_UNLOCK;
 
-    vlc_event_attach( services_discovery_EventManager( p_sd ),
-                      vlc_ServicesDiscoveryItemAdded,
+    vlc_event_manager_t *em = services_discovery_EventManager( p_sd );
+    vlc_event_attach( em, vlc_ServicesDiscoveryItemAdded,
                       playlist_sd_item_added, p_node );
 
-    vlc_event_attach( services_discovery_EventManager( p_sd ),
-                      vlc_ServicesDiscoveryItemRemoved,
+    vlc_event_attach( em, vlc_ServicesDiscoveryItemRemoved,
                       playlist_sd_item_removed, p_node );
 
     if( !vlc_sd_Start( p_sd ) )
@@ -360,8 +357,6 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,
         return VLC_EGENERIC;
     }
 
-    /* We want tree-view for service directory */
-    p_node->p_input->b_prefers_tree = true;
     p_sds->p_sd = p_sd;
     p_sds->p_node = p_node;
     p_sds->psz_name = strdup( psz_name );