Use var_Inherit* instead of var_CreateGet*.

[vlc] / modules / services_discovery / bonjour.c

diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c
index 817dc6ecf26c117f36e9cc48ad16d0b8a35ac834..0110e016b0f81d5cfbed5933d4fab0e799d0d385 100644 (file)
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/bonjour.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * bonjour.c: Bonjour services discovery module
  *****************************************************************************
- * Copyright (C) 2005-2008 the VideoLAN team
+ * Copyright (C) 2005-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon@nanocrew.net>
@@ -31,8 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_playlist.h>
-#include <vlc_arrays.h>
+#include <vlc_services_discovery.h>
 
 #include <avahi-client/client.h>
 #include <avahi-client/publish.h>
@@ -49,14 +48,18 @@
     static int  Open ( vlc_object_t * );
     static void Close( vlc_object_t * );
 
-vlc_module_begin();
-    set_shortname( "Bonjour" );
-    set_description( N_("Bonjour services") );
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
-    set_capability( "services_discovery", 0 );
-    set_callbacks( Open, Close );
-vlc_module_end();
+VLC_SD_PROBE_HELPER("bonjour", "Bonjour services", SD_CAT_LAN)
+
+vlc_module_begin ()
+    set_shortname( "Bonjour" )
+    set_description( N_("Bonjour services") )
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )
+    set_capability( "services_discovery", 0 )
+    set_callbacks( Open, Close )
+
+    VLC_SD_PROBE_SUBMODULE
+vlc_module_end ()
 
 /*****************************************************************************
  * Local structures
@@ -169,13 +172,12 @@ static void resolve_callback(
             }
         }
 
-        if( psz_addr != NULL )
-            free( (void *)psz_addr );
+        free( psz_addr );
 
         if( psz_uri != NULL )
         {
-            p_input = input_item_NewExt( p_sd, psz_uri, name, 0, NULL, -1 );
-            free( (void *)psz_uri );
+            p_input = input_item_New( p_sd, psz_uri, name );
+            free( psz_uri );
         }
         if( p_input != NULL )
         {
@@ -246,14 +248,10 @@ static int Open( vlc_object_t *p_this )
     services_discovery_sys_t *p_sys;
     int err;
 
-    p_sd->p_sys = p_sys = (services_discovery_sys_t *)malloc(
-        sizeof( services_discovery_sys_t ) );
-
+    p_sd->p_sys = p_sys = calloc( 1, sizeof( services_discovery_sys_t ) );
     if( !p_sys )
         return VLC_ENOMEM;
 
-    memset( p_sys, 0, sizeof(*p_sys) );
-
     vlc_dictionary_init( &p_sys->services_name_to_input_item, 1 );
 
     p_sys->poll = avahi_threaded_poll_new();
@@ -282,8 +280,6 @@ static int Open( vlc_object_t *p_this )
         goto error;
     }
 
-    services_discovery_SetLocalizedName( p_sd, _("Bonjour") );
-
     return VLC_SUCCESS;
 
 error: