Remove useless parameter to net_Select

[vlc] / modules / services_discovery / bonjour.c

diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c
index 1f5e3bf83c5528154ce9f9318719b1f5e57ffc7a..f3108d8f9b31227011912f3f6d8a5e921cad1ab2 100644 (file)
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/bonjour.c
@@ -24,10 +24,11 @@
 /*****************************************************************************
  * Includes
  *****************************************************************************/
+#define _GNU_SOURCE
 #include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_playlist.h>
 
 #include <avahi-client/client.h>
 #ifdef HAVE_AVAHI_06
@@ -238,8 +239,8 @@ static void browse_callback(
             msg_Err( p_sd, "failed to find service '%s' in playlist", name );
         else
         {
-            playlist_LockDeleteAllFromInput( p_sys->p_playlist,
-                                              p_item->p_input->i_id );
+            playlist_DeleteFromInput( p_sys->p_playlist, p_item->p_input->i_id,
+                                      VLC_FALSE );
         }
     }
 }
@@ -251,8 +252,6 @@ static int Open( vlc_object_t *p_this )
 {
     services_discovery_t *p_sd = ( services_discovery_t* )p_this;
     services_discovery_sys_t *p_sys;
-    playlist_view_t *p_view;
-    vlc_value_t val;
     int err;
 
     p_sd->p_sys = p_sys = (services_discovery_sys_t *)malloc(
@@ -307,9 +306,17 @@ static int Open( vlc_object_t *p_this )
         goto error;
     }
 
-    playlist_NodesCreate( p_sys->p_playlist, _("Bonjour"),
-                              &p_sys->p_node_cat,&p_sys->p_node_one,
-                              VLC_TRUE );
+    p_sys->p_node_cat = playlist_NodeCreate( p_sys->p_playlist, _("Bonjour"),
+                                       p_sys->p_playlist->p_root_category, 0 );
+    p_sys->p_node_one = playlist_NodeCreate( p_sys->p_playlist, _("Bonjour"),
+                                       p_sys->p_playlist->p_root_onelevel, 0 );
+    p_sys->p_node_one->p_input->i_id = p_sys->p_node_cat->p_input->i_id;
+
+    p_sys->p_node_one->i_flags |= PLAYLIST_RO_FLAG;
+    p_sys->p_node_cat->i_flags |= PLAYLIST_RO_FLAG;
+    p_sys->p_node_one->i_flags |= PLAYLIST_SKIP_FLAG;
+    p_sys->p_node_cat->i_flags |= PLAYLIST_SKIP_FLAG;
+
     p_sd->pf_run = Run;
 
     return VLC_SUCCESS;