services_discovery/*: String review (refs #438) and suppress the sap-addr option

diff --git a/modules/services_discovery/daap.c b/modules/services_discovery/daap.c
index 87361650c55289552d32075d63d10cf74aad706e..9790fb85d742994b7f5d3d8c26f610d37250fa32 100644 (file)
--- a/modules/services_discovery/daap.c
+++ b/modules/services_discovery/daap.c
@@ -220,7 +220,7 @@ static int OpenAccess( vlc_object_t *p_this )
 
     if( p_sys->p_db == NULL || i_ret )
     {
-        msg_Err( p_access, "The DAAP services_discovery module must be enabled" );
+        msg_Err( p_access, "the DAAP services_discovery module must be enabled" );
         return VLC_EGENERIC;
     }
 
@@ -276,7 +276,7 @@ static int OpenAccess( vlc_object_t *p_this )
     }
 
 
-    msg_Dbg( p_access, "Downloading %s song %i (db %i)",
+    msg_Dbg( p_access, "downloading %s song %i (db %i)",
                            p_sys->songdata.songformat,
                            p_sys->i_song, p_sys->p_host->i_database_id );
 
@@ -287,7 +287,7 @@ static int OpenAccess( vlc_object_t *p_this )
                                           p_sys->songdata.songformat,
                                           &(p_sys->song) );
 
-    msg_Dbg( p_access, "Finished downloading, read %i bytes (ret %i)",
+    msg_Dbg( p_access, "finished downloading, read %i bytes (ret %i)",
                                           p_sys->song.size, i_ret );
 
     p_access->info.i_size = p_sys->song.size;

diff --git a/modules/services_discovery/hal.c b/modules/services_discovery/hal.c
index b65f55d71111f880edc102cf75c4b2c04a7e4f01..6aad8d524bb34d31c2651b5497b9f6efd6da9154 100644 (file)
--- a/modules/services_discovery/hal.c
+++ b/modules/services_discovery/hal.c
@@ -115,14 +115,14 @@ static int Open( vlc_object_t *p_this )
     p_sys->p_ctx = libhal_ctx_new();
     if( !p_sys->p_ctx )
     {
-        msg_Err( p_sd, "Unable to create HAL context") ;
+        msg_Err( p_sd, "unable to create HAL context") ;
         free( p_sys );
         return VLC_EGENERIC;
     }
     p_connection = dbus_bus_get( DBUS_BUS_SYSTEM, &dbus_error );
     if( dbus_error_is_set( &dbus_error ) )
     {
-        msg_Err( p_sd, "Unable to connect to DBUS: %s", dbus_error.message );
+        msg_Err( p_sd, "unable to connect to DBUS: %s", dbus_error.message );
         dbus_error_free( &dbus_error );
         free( p_sys );
         return VLC_EGENERIC;

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 60822ae8b1347f01f8b7dc7de7cc82f5264e40d0..28c97a3c117099630f4d5f5b33267b8150b3be76 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -76,8 +76,6 @@ static const char ipv6_scopes[] = "1456789ABCDE";
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define SAP_ADDR_TEXT N_( "SAP multicast address" )
-#define SAP_ADDR_LONGTEXT N_( "Listen for SAP announcements on another address" )
 #define SAP_IPV4_TEXT N_( "IPv4-SAP listening" )
 #define SAP_IPV4_LONGTEXT N_( \
       "Set this if you want the SAP module to listen to IPv4 announcements " \
@@ -123,8 +121,6 @@ vlc_module_begin();
     set_category( CAT_PLAYLIST );
     set_subcategory( SUBCAT_PLAYLIST_SD );
 
-    add_string( "sap-addr", NULL, NULL,
-                SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, VLC_TRUE );
     add_bool( "sap-ipv4", 1 , NULL,
                SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, VLC_TRUE );
     add_bool( "sap-ipv6", 1 , NULL,
@@ -139,6 +135,7 @@ vlc_module_begin();
                SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, VLC_TRUE );
     add_bool( "sap-timeshift", 0 , NULL,
               SAP_TIMESHIFT_TEXT,SAP_TIMESHIFT_LONGTEXT, VLC_TRUE );
+    add_suppressed_string( "sap-addr" );
 
     set_capability( "services_discovery", 0 );
     set_callbacks( Open, Close );
@@ -418,7 +415,7 @@ error:
     free( psz_sdp );
     if( p_sdp ) FreeSDP( p_sdp );
     stream_Seek( p_demux->s, 0 );
-    return VLC_EGENERIC;    
+    return VLC_EGENERIC;
 }
 
 /*****************************************************************************
@@ -503,12 +500,6 @@ static void Run( services_discovery_t *p_sd )
         }
     }
 
-    psz_addr = var_CreateGetString( p_sd, "sap-addr" );
-    if( psz_addr && *psz_addr )
-    {
-        InitSocket( p_sd, psz_addr, SAP_PORT );
-    }
-
     if( p_sd->p_sys->i_fd == 0 )
     {
         msg_Err( p_sd, "unable to listen on any address" );
@@ -650,7 +641,7 @@ static int ParseSAP( services_discovery_t *p_sd, uint8_t *p_buffer, int i_read )
         psz_sdp += 4;
         if( i_read <= 9 )
         {
-            msg_Warn( p_sd, "too short SAP packet\n" );
+            msg_Warn( p_sd, "too short SAP packet" );
             return VLC_EGENERIC;
         }
     }
@@ -659,7 +650,7 @@ static int ParseSAP( services_discovery_t *p_sd, uint8_t *p_buffer, int i_read )
         psz_sdp += 16;
         if( i_read <= 21 )
         {
-            msg_Warn( p_sd, "too short SAP packet\n" );
+            msg_Warn( p_sd, "too short SAP packet" );
             return VLC_EGENERIC;
         }
     }
@@ -679,7 +670,7 @@ static int ParseSAP( services_discovery_t *p_sd, uint8_t *p_buffer, int i_read )
             free( p_decompressed_buffer );
         }
 #else
-        msg_Warn( p_sd, "Ignoring compressed sap packet" );
+        msg_Warn( p_sd, "ignoring compressed sap packet" );
         return VLC_EGENERIC;
 #endif
     }
@@ -710,7 +701,7 @@ static int ParseSAP( services_discovery_t *p_sd, uint8_t *p_buffer, int i_read )
     }
     if( ( psz_sdp != psz_foo ) && strcasecmp( psz_foo, "application/sdp" ) )
     {
-        msg_Dbg( p_sd, "unhandled content type: %s", psz_foo );        
+        msg_Dbg( p_sd, "unhandled content type: %s", psz_foo );
     }
     if( ( psz_sdp - (char *)p_buffer ) >= i_read )
     {
@@ -767,7 +758,7 @@ static int ParseSAP( services_discovery_t *p_sd, uint8_t *p_buffer, int i_read )
     /* Add item */
     if( p_sdp->i_media > 1 )
     {
-        msg_Dbg( p_sd, "passing to LIVE.COM" );
+        msg_Dbg( p_sd, "passing to liveMedia" );
     }
 
     CreateAnnounce( p_sd, i_hash, p_sdp );
@@ -1064,7 +1055,7 @@ static sdp_t *  ParseSDP( vlc_object_t *p_obj, char* psz_sdp )
 
     if( psz_sdp[0] != 'v' || psz_sdp[1] != '=' )
     {
-        msg_Warn( p_obj, "Bad packet" );
+        msg_Warn( p_obj, "bad packet" );
         return NULL;
     }
 
@@ -1403,10 +1394,10 @@ static vlc_bool_t IsSameSession( sdp_t *p_sdp1, sdp_t *p_sdp2 )
 
 static void CacheLoad( services_discovery_t *p_sd )
 {
-    msg_Warn( p_sd, "Cache not implemented") ;
+    msg_Warn( p_sd, "cache not implemented") ;
 }
 
 static void CacheSave( services_discovery_t *p_sd )
 {
-    msg_Warn( p_sd, "Cache not implemented") ;
+    msg_Warn( p_sd, "cache not implemented") ;
 }

diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c
index 0cf5088d3dc32379f2311ab04b42c1b2c37c9d2a..f5e64acddc91ac06d363bd522f58703f3645106d 100644 (file)
--- a/modules/services_discovery/shout.c
+++ b/modules/services_discovery/shout.c
@@ -58,13 +58,12 @@
     static int  Open ( vlc_object_t * );
     static void Close( vlc_object_t * );
 
-/// \bug Shortdesc too long
-#define LIMIT_TEXT N_("Maximum number of shoutcast servers to be listed")
-#define LIMIT_LONGTEXT LIMIT_TEXT
+#define LIMIT_TEXT N_("Number of streams")
+#define LIMIT_LONGTEXT N_("Maximum number of Shoutcast radio streams which " \
+                          "would be listed.")
 
 vlc_module_begin();
     set_shortname( "Shoutcast");
-    /// \bug Correct ?
     set_description( _("Shoutcast radio listings") );
     set_category( CAT_PLAYLIST );
     set_subcategory( SUBCAT_PLAYLIST_SD );