[vlc-devel] [PATCH] access_output: Rename shout module and correct spelling

[Marvin Scholz]

Icecast is spelled Icecast, capital I, lowercase c nowadays, it was
never spelled IceCast or ICEcast. This corrects it, translators
still need to fix the translation strings though.

Additionally this renames the modules shortname from Shoutcast to
Icecast. The library that powers it, libshout, even though it has shout
in it's name for historical reasons, does mainly supports Icecast
and not SHOUTcast. (Only the legacy Shoutcast protocol is supported)

For the same reason as above mentioned, in descriptions for fields the
order of Icecast and SHOUTcast was swapped.
---
 modules/access_output/shout.c | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c
index 5a844c7..e0cd0aa 100644
--- a/modules/access_output/shout.c
+++ b/modules/access_output/shout.c
@@ -63,17 +63,17 @@ static void Close( vlc_object_t * );
 
 #define NAME_TEXT N_("Stream name")
 #define NAME_LONGTEXT N_("Name to give to this stream/channel on the " \
-                         "shoutcast/icecast server." )
+                         "Icecast/SHOUTcast server." )
 
 #define DESCRIPTION_TEXT N_("Stream description")
 #define DESCRIPTION_LONGTEXT N_("Description of the stream content or " \
                                 "information about your channel." )
 
 #define MP3_TEXT N_("Stream MP3")
-#define MP3_LONGTEXT N_("You normally have to feed the shoutcast module " \
+#define MP3_LONGTEXT N_("You normally have to feed the Icecast module " \
                         "with Ogg streams. It is also possible to stream " \
                         "MP3 instead, so you can forward MP3 streams to " \
-                        "the shoutcast/icecast server." )
+                        "the Icecast/SHOUTcast server." )
 
 /* To be listed properly as a public stream on the Yellow Pages of shoutcast/icecast
    the genres should match those used on the corresponding sites. Several examples
@@ -103,16 +103,17 @@ static void Close( vlc_object_t * );
 
 #define PUBLIC_TEXT N_("Stream public")
 #define PUBLIC_LONGTEXT N_("Make the server publicly available on the 'Yellow Pages' " \
-                           "(directory listing of streams) on the icecast/shoutcast " \
+                           "(directory listing of streams) on the Icecast/SHOUTcast " \
                            "website. Requires the bitrate information specified for " \
                            "shoutcast. Requires Ogg streaming for icecast." )
 
 vlc_module_begin ()
-    set_description( N_("IceCAST output") )
-    set_shortname( "Shoutcast" )
+    set_description( N_("Icecast output") )
+    set_shortname( "Icecast" )
     set_capability( "sout access", 0 )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_ACO )
+    add_shortcut( "Shoutcast" )
     add_shortcut( "shout" )
     add_string( SOUT_CFG_PREFIX "name", "VLC media player - Live stream",
                 NAME_TEXT, NAME_LONGTEXT, false )
@@ -216,7 +217,7 @@ static int Open( vlc_object_t *p_this )
          /* || shout_set_nonblocking( p_shout, 1 ) != SHOUTERR_SUCCESS */
       )
     {
-        msg_Err( p_access, "failed to initialize shout streaming to %s:%i/%s",
+        msg_Err( p_access, "failed to initialize libshout streaming to %s:%i/%s",
                  url.psz_host, url.i_port, url.psz_path );
 
         free( psz_name );
@@ -236,12 +237,12 @@ static int Open( vlc_object_t *p_this )
 
     if( i_ret != SHOUTERR_SUCCESS )
     {
-        msg_Err( p_access, "failed to set the shoutcast streaming format" );
+        msg_Err( p_access, "failed to set the libshout streaming format" );
         goto error;
     }
 
     /* Don't force bitrate to 0 but only use when specified. This will otherwise
-       show an empty field on icecast directory listing instead of NA */
+       show an empty field on Icecast directory listing instead of NA */
     psz_val = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "bitrate" );
     if( psz_val )
     {
@@ -255,15 +256,15 @@ static int Open( vlc_object_t *p_this )
     }
     else
     {
-        /* Bitrate information is used for icecast/shoutcast servers directory
+        /* Bitrate information is used for Icecast/SHOUTcast servers directory
            listings (sorting, stream info etc.) */
         msg_Warn( p_access, "no bitrate information specified (required for listing " \
                             "the server as public on the shoutcast website)" );
     }
 
     /* Information about samplerate, channels and quality will not be propagated
-       through the YP protocol for icecast to the public directory listing when
-       the icecast server is operating in shoutcast compatibility mode */
+       through the YP protocol for Icecast to the public directory listing when
+       the Icecast server is operating in SHOUTcast compatibility mode */
 
     psz_val = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "samplerate" );
     if( psz_val )
@@ -306,7 +307,7 @@ static int Open( vlc_object_t *p_this )
         i_ret = shout_set_public( p_shout, 1 );
         if( i_ret != SHOUTERR_SUCCESS )
         {
-            msg_Err( p_access, "failed to set the server status setting to public" );
+            msg_Err( p_access, "failed to set the stream status setting to public" );
             goto error;
         }
     }
@@ -330,16 +331,16 @@ static int Open( vlc_object_t *p_this )
         if( i_ret == SHOUTERR_SUCCESS )
         {
             i_ret = SHOUTERR_CONNECTED;
-            msg_Dbg( p_access, "connected using 'icy' (shoutcast) protocol" );
+            msg_Dbg( p_access, "connected using 'icy' (SHOUTcast) protocol" );
         }
         else
         {
-            msg_Warn( p_access, "failed to connect using 'icy' (shoutcast) protocol" );
+            msg_Warn( p_access, "failed to connect using 'icy' (SHOUTcast) protocol" );
 
             /* Shout parameters cannot be changed on an open connection */
             shout_close( p_shout );
 
-            /* IceCAST using HTTP protocol */
+            /* Icecast using HTTP protocol */
             i_ret = shout_set_protocol( p_shout, SHOUT_PROTOCOL_HTTP );
             if( i_ret != SHOUTERR_SUCCESS )
             {
@@ -350,10 +351,10 @@ static int Open( vlc_object_t *p_this )
             if( i_ret == SHOUTERR_SUCCESS )
             {
                 i_ret = SHOUTERR_CONNECTED;
-                msg_Dbg( p_access, "connected using 'http' (icecast 2.x) protocol" );
+                msg_Dbg( p_access, "connected using 'http' (Icecast 2.x) protocol" );
             }
             else
-                msg_Warn( p_access, "failed to connect using 'http' (icecast 2.x) protocol " );
+                msg_Warn( p_access, "failed to connect using 'http' (Icecast 2.x) protocol " );
         }
 /*
         for non-blocking, use:
-- 
2.7.4 (Apple Git-66)