Qt4 - #include cleaning

[vlc] / modules / services_discovery / bonjour.c

diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c
index b7d208f372b94a184b459dd061cdd232aaabf2f0..b03672c961546c1692851ce77bbe6d563afad9a8 100644 (file)
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/bonjour.c
@@ -18,16 +18,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Includes
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_playlist.h>
+#include <vlc_arrays.h>
 
 #include <avahi-client/client.h>
 #ifdef HAVE_AVAHI_06
@@ -61,13 +61,10 @@ vlc_module_end();
 
 struct services_discovery_sys_t
 {
-    /* playlist node */
-    playlist_item_t     *p_node;
-    playlist_t          *p_playlist;
-
     AvahiSimplePoll     *simple_poll;
     AvahiClient         *client;
     AvahiServiceBrowser *sb;
+    vlc_dictionary_t    services_name_to_input_item;
 };
 
 /*****************************************************************************
@@ -137,7 +134,7 @@ static void resolve_callback(
         char *psz_uri = NULL;
         char *psz_addr = NULL;
         AvahiStringList *asl = NULL;
-        playlist_item_t *p_item = NULL;
+        input_item_t *p_input = NULL;
 
         msg_Dbg( p_sd, "service '%s' of type '%s' in domain '%s'",
                  name, type, domain );
@@ -175,17 +172,15 @@ static void resolve_callback(
 
         if( psz_uri != NULL )
         {
-            p_item = playlist_ItemNew( p_sd, psz_uri, name );
+            p_input = input_ItemNewExt( p_sd, psz_uri, name, 0, NULL, -1 );
             free( (void *)psz_uri );
         }
-        if( p_item != NULL )
+        if( p_input != NULL )
         {
-            p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
-
-            playlist_NodeAddItem( p_sys->p_playlist, p_item,
-                                  VIEW_CATEGORY, p_sys->p_node,
-                                  PLAYLIST_APPEND, PLAYLIST_END );
-        }
+            vlc_dictionary_insert( &p_sys->services_name_to_input_item,
+                name, p_input );
+            services_discovery_AddItem( p_sd, p_input, NULL /* no category */ );
+       }
     }
 
     avahi_service_resolver_free( r );
@@ -225,16 +220,19 @@ static void browse_callback(
     }
     else
     {
-        playlist_item_t *p_item;
-
-        p_item = playlist_ChildSearchName( p_sys->p_node, name );
-        if( p_item == NULL )
-        {
+        /** \todo Store the input id and search it, rather than searching the items */
+        input_item_t *p_item;
+        p_item = vlc_dictionary_value_for_key(
+                        &p_sys->services_name_to_input_item,
+                        name );
+        if( !p_item )
             msg_Err( p_sd, "failed to find service '%s' in playlist", name );
-        }
         else
         {
-            playlist_Delete( p_sys->p_playlist, p_item->input.i_id );
+            services_discovery_RemoveItem( p_sd, p_item );
+            vlc_dictionary_remove_value_for_key(
+                        &p_sys->services_name_to_input_item,
+                        name );
         }
     }
 }
@@ -246,8 +244,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(
@@ -260,6 +256,8 @@ static int Open( vlc_object_t *p_this )
 
     memset( p_sys, 0, sizeof(*p_sys) );
 
+    vlc_dictionary_init( &p_sys->services_name_to_input_item, 1 );
+
     p_sys->simple_poll = avahi_simple_poll_new();
     if( p_sys->simple_poll == NULL )
     {
@@ -292,31 +290,13 @@ static int Open( vlc_object_t *p_this )
         goto error;
     }
 
-    /* Create our playlist node */
-    p_sys->p_playlist = (playlist_t *)vlc_object_find( p_sd,
-                                                       VLC_OBJECT_PLAYLIST,
-                                                       FIND_ANYWHERE );
-    if( !p_sys->p_playlist )
-    {
-        msg_Warn( p_sd, "unable to find playlist, cancelling");
-        goto error;
-    }
-
-    p_view = playlist_ViewFind( p_sys->p_playlist, VIEW_CATEGORY );
-    p_sys->p_node = playlist_NodeCreate( p_sys->p_playlist, VIEW_CATEGORY,
-                                         _("Bonjour"), p_view->p_root );
-
-    p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
-    val.b_bool = VLC_TRUE;
-    var_Set( p_sys->p_playlist, "intf-change", val );
+    services_discovery_SetLocalizedName( p_sd, _("Bonjour") );
 
     p_sd->pf_run = Run;
 
     return VLC_SUCCESS;
 
 error:
-    if( p_sys->p_playlist != NULL )
-        vlc_object_release( p_sys->p_playlist );
     if( p_sys->sb != NULL )
         avahi_service_browser_free( p_sys->sb );
     if( p_sys->client != NULL )
@@ -324,7 +304,8 @@ error:
     if( p_sys->simple_poll != NULL )
         avahi_simple_poll_free( p_sys->simple_poll );
 
-    free( (void *)p_sys );
+    vlc_dictionary_clear( &p_sys->services_name_to_input_item );
+    free( p_sys );
 
     return VLC_EGENERIC;
 }
@@ -341,9 +322,7 @@ static void Close( vlc_object_t *p_this )
     avahi_client_free( p_sys->client );
     avahi_simple_poll_free( p_sys->simple_poll );
 
-    playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node, VLC_TRUE, VLC_TRUE );
-    vlc_object_release( p_sys->p_playlist );
-
+    vlc_dictionary_clear( &p_sys->services_name_to_input_item );
     free( p_sys );
 }