Shoutcast SD, goodbye

[vlc] / modules / services_discovery / upnp_intel.cpp

diff --git a/modules/services_discovery/upnp_intel.cpp b/modules/services_discovery/upnp_intel.cpp
index b6fcaabee7397d5c79a0dbaaee4ccc933b0a772b..452264386c42e8b4cef0333beac124e1d9a59c91 100644 (file)
--- a/modules/services_discovery/upnp_intel.cpp
+++ b/modules/services_discovery/upnp_intel.cpp
@@ -55,7 +55,7 @@ struct services_discovery_sys_t
 // VLC callback prototypes
 static int Open( vlc_object_t* );
 static void Close( vlc_object_t* );
-VLC_SD_PROBE_HELPER("upnp", N_("Universal Plug'n'Play"))
+VLC_SD_PROBE_HELPER("upnp", "Universal Plug'n'Play", SD_CAT_LAN)
 
 // Module descriptor
 
@@ -790,8 +790,7 @@ void MediaServer::_buildPlaylist( Container* parent, input_item_node_t *p_input_
     {
         Container* container = parent->getContainer( i );
 
-        input_item_t* p_input_item = input_item_New( _p_sd, "vlc://nop", parent->getTitle() ); 
-        input_item_AddSubItem( parent->getInputItem(), p_input_item );
+        input_item_t* p_input_item = input_item_New( _p_sd, "vlc://nop", parent->getTitle() );
         input_item_node_t *p_new_node =
             input_item_node_AppendItem( p_input_node, p_input_item );
 
@@ -807,16 +806,12 @@ void MediaServer::_buildPlaylist( Container* parent, input_item_node_t *p_input_
                                                item->getResource(),
                                                item->getTitle() );
         assert( p_input_item );
-        input_item_AddSubItem( parent->getInputItem(), p_input_item );
         input_item_node_AppendItem( p_input_node, p_input_item );
         item->setInputItem( p_input_item );
     }
 
     if( send )
-    {
-        input_item_AddSubItemTree( p_input_node );
-        input_item_node_Delete( p_input_node );
-    }
+        input_item_node_PostAndDelete( p_input_node );
 }
 
 void MediaServer::setInputItem( input_item_t* p_input_item )