Changeset 48031dcee045d4d3855154f0ec946f1672c728d5

Timestamp:

16/08/06 23:36:26 (2 years ago)

Author:

Dennis van Amerongen <trax@videolan.org>

git-committer:

Dennis van Amerongen <trax@videolan.org> 1155764186 +0000

git-parent:

[b93020a1d8f9904022bf97c829890bfda928b6df]

git-author:

Dennis van Amerongen <trax@videolan.org> 1155764186 +0000

Message:

* modules/access_output/shout.c: changed 'no bitrate information' warning to be used for both icecast and shoutcast.

Files:

• modules/access_output/shout.c (modified) (8 diffs)

modules/access_output/shout.c

@@ -96 +96 @@
-#define QUALITY_LONGTEXT N_("Ogg Vorbis Quality information of the transcoded stream. " )
-
-P
+p
-#define PUBLIC_LONGTEXT N_("Make the server publicly available on the 'Yellow Pages' " \
-
-
-
-
+
+
+
-
-vlc_module_begin();
@@ -121 +120 @@
-    add_string( SOUT_CFG_PREFIX "url", "http://www.videolan.org/vlc", NULL,
-                URL_TEXT, URL_LONGTEXT, VLC_FALSE );
-0
+
-                BITRATE_TEXT, BITRATE_LONGTEXT, VLC_FALSE );
-    add_string( SOUT_CFG_PREFIX "samplerate", "", NULL,
@@ -178 +177 @@
-    char *psz_genre = NULL;
-    char *psz_url = NULL;
-    char *psz_bitrate = NULL;
-
-    sout_CfgParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
@@ -240 +238 @@
-        free( val.psz_string );
-
-    var_Get( p_access, SOUT_CFG_PREFIX "bitrate", &val );
-    if( *val.psz_string )
-        psz_bitrate = val.psz_string;
-    else
-        free( val.psz_string );
-
-    p_shout = p_sys->p_shout = shout_new();
-    if( !p_shout
@@ -259 +251 @@
-         || shout_set_genre( p_shout, psz_genre ) != SHOUTERR_SUCCESS
-         || shout_set_url( p_shout, psz_url ) != SHOUTERR_SUCCESS
-         || shout_set_audio_info( p_shout, SHOUT_AI_BITRATE, psz_bitrate ) != SHOUTERR_SUCCESS
-//       || shout_set_nonblocking( p_shout, 1 ) != SHOUTERR_SUCCESS
-      )
@@ -274 +265 @@
-    if( psz_genre ) free( psz_genre );
-    if( psz_url ) free( psz_url );
-    if( psz_bitrate ) free( psz_bitrate );
-
-    var_Get( p_access, SOUT_CFG_PREFIX "mp3", &val );
@@ -289 +279 @@
-        return VLC_EGENERIC;
-    }
+
+
+    /* 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 */
+    var_Get( p_access, SOUT_CFG_PREFIX "bitrate", &val );
+    if( *val.psz_string )
+    {
+        i_ret = shout_set_audio_info( p_shout, SHOUT_AI_BITRATE, val.psz_string );
+    }
+    else
+    {
+        /* 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)" );
+        free( val.psz_string );
+    }
+
+    if( i_ret != SHOUTERR_SUCCESS )
+    {
+        msg_Err( p_access, "failed to set the information about the bitrate" );
+        free( p_access->p_sys );
+        free( psz_accessname );
+        return VLC_EGENERIC;
+    }
+
+    /* 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 */
-
-    var_Get( p_access, SOUT_CFG_PREFIX "samplerate", &val );
@@ -380 +399 @@
-            free( psz_accessname );
-            return VLC_EGENERIC;
-        }
-
-        /* Server status public requires the shout bitrate to be specified */
-        if( shout_get_audio_info ( p_shout, SHOUT_AI_BITRATE ) == "0" )
-        {
-            if ( shout_get_public ( p_shout ))
-            {
-                msg_Warn( p_access, "server status public for shoutcast not supported: " \
-                                    "no bitrate specified" );
-                free( p_access->p_sys );
-                free( psz_accessname );
-                return VLC_EGENERIC;
-            }
-        }
-