- const char *psz_next = strchr( psz_parser, ':' );
- if( psz_next == NULL )
- psz_next = psz_parser + strlen( psz_parser );
-
- char psz_plugin[psz_next - psz_parser + 1];
- memcpy (psz_plugin, psz_parser, sizeof (psz_plugin) - 1);
- psz_plugin[sizeof (psz_plugin) - 1] = '\0';
- psz_parser = psz_next;
-
- /* Perform the addition */
- msg_Dbg( p_playlist, "Add services_discovery %s", psz_plugin );
- services_discovery_t *p_sd;
-
- p_sd = services_discovery_Create( (vlc_object_t*)p_playlist, psz_plugin );
- if( !p_sd )
- continue;
-
- char * psz = services_discovery_GetLocalizedName( p_sd );
- assert( psz );
- PL_LOCK;
- playlist_NodesPairCreate( p_playlist, psz,
- &p_cat, &p_one, false );
- PL_UNLOCK;
- free( psz );
-
- vlc_event_attach( services_discovery_EventManager( p_sd ),
- vlc_ServicesDiscoveryItemAdded,
- playlist_sd_item_added,
- p_one );
-
- vlc_event_attach( services_discovery_EventManager( p_sd ),
- vlc_ServicesDiscoveryItemAdded,
- playlist_sd_item_added,
- p_cat );
-
- vlc_event_attach( services_discovery_EventManager( p_sd ),
- vlc_ServicesDiscoveryItemRemoved,
- playlist_sd_item_removed,
- p_one );
-
- vlc_event_attach( services_discovery_EventManager( p_sd ),
- vlc_ServicesDiscoveryItemRemoved,
- playlist_sd_item_removed,
- p_cat );
-
- services_discovery_Start( p_sd );
-
- /* Free in playlist_ServicesDiscoveryRemove */
- p_sds = malloc( sizeof(struct playlist_services_discovery_support_t) );
- if( !p_sds )
- return VLC_ENOMEM;
-
- /* We want tree-view for service directory */
- p_one->p_input->b_prefers_tree = true;
- p_sds->p_sd = p_sd;
- p_sds->p_one = p_one;
- p_sds->p_cat = p_cat;
-
- PL_LOCK;
- TAB_APPEND( p_playlist->i_sds, p_playlist->pp_sds, p_sds );
- PL_UNLOCK;
+ PL_LOCK;
+ p_node = playlist_NodeCreate( p_playlist, psz_longname,
+ p_playlist->p_root, 0, NULL );
+ PL_UNLOCK;
+
+ 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( em, vlc_ServicesDiscoveryItemRemoved,
+ playlist_sd_item_removed, p_node );
+
+ if( !vlc_sd_Start( p_sd ) )
+ {
+ vlc_sd_Destroy( p_sd );
+ free( p_sds );
+ return VLC_EGENERIC;