Changeset f449bc75656316b692cfd7dce6a80cc363243f99

Timestamp:

04/08/07 16:04:31 (1 year ago)

Author:

Dennis van Amerongen <trax@videolan.org>

git-committer:

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

git-parent:

[2ece18d460b0cc45527f3eaea9ba9d8fbcb9e3a5]

git-author:

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

Message:

* modules/access_output/shout.c: Initialize shout settings properly and make ICY the default protocol. This fixes some libshout Socket error messages on initialization. Closes #1003.

Files:

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

modules/access_output/shout.c

@@ -242 +242 @@
-    if( !p_shout
-         || shout_set_host( p_shout, psz_host ) != SHOUTERR_SUCCESS
-HTTP
+ICY
-         || shout_set_port( p_shout, i_port ) != SHOUTERR_SUCCESS
-         || shout_set_password( p_shout, psz_pass ) != SHOUTERR_SUCCESS
@@ -252 +252 @@
-         || shout_set_genre( p_shout, psz_genre ) != SHOUTERR_SUCCESS
-         || shout_set_url( p_shout, psz_url ) != SHOUTERR_SUCCESS
-
+
-      )
-    {
@@ -281 +281 @@
-    }
-
-
-    /* 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 */
@@ -288 +287 @@
-    {
-        i_ret = shout_set_audio_info( p_shout, SHOUT_AI_BITRATE, 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;
+        }
-    }
-    else
@@ -298 +304 @@
-    }
-
-    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
@@ -312 +310 @@
-    var_Get( p_access, SOUT_CFG_PREFIX "samplerate", &val );
-    if( *val.psz_string )
+    {
-        i_ret = shout_set_audio_info( p_shout, SHOUT_AI_SAMPLERATE, val.psz_string );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            free( p_access->p_sys );
-            free( psz_accessname );
-            return VLC_EGENERIC;
-        }
+    }
+    else
+        free( val.psz_string );
+
+    var_Get( p_access, SOUT_CFG_PREFIX "channels", &val );
+    if( *val.psz_string )
+    {
+        i_ret = shout_set_audio_info( p_shout, SHOUT_AI_CHANNELS, val.psz_string );
+        if( i_ret != SHOUTERR_SUCCESS )
+        {
+            msg_Err( p_access, "failed to set the information about the number of channels" );
+            free( p_access->p_sys );
+            free( psz_accessname );
+            return VLC_EGENERIC;
+        }
+    }
+    else
+        free( val.psz_string );
+
+    var_Get( p_access, SOUT_CFG_PREFIX "quality", &val );
+    if( *val.psz_string )
+    {
+        i_ret = shout_set_audio_info( p_shout, SHOUT_AI_QUALITY, val.psz_string );
+        if( i_ret != SHOUTERR_SUCCESS )
+        {
+            msg_Err( p_access, "failed to set the information about Ogg Vorbis quality" );
+            free( p_access->p_sys );
+            free( psz_accessname );
+            return VLC_EGENERIC;
+        }
+    }
+    else
+        free( val.psz_string );
+
+    var_Get( p_access, SOUT_CFG_PREFIX "public", &val );
+    if( val.b_bool == VLC_TRUE )
+    {
+        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" );
+            free( p_access->p_sys );
+            free( psz_accessname );
+            return VLC_EGENERIC;
+        }
+    }
+
+    /* Shoutcast using ICY protocol */
+    i_ret = shout_open( p_shout );
+    if( i_ret == SHOUTERR_SUCCESS )
+    {
+        i_ret = SHOUTERR_CONNECTED;
+        msg_Dbg( p_access, "connected using 'icy' (shoutcast) protocol" );
+    }
+    else
+    {
+        msg_Warn( p_access, "failed to connect using 'icy' (shoutcast) protocol" );
-
-        /* Shout parameters cannot be changed on an open connection */
@@ -393 +384 @@
-        }
-
-
+
+
-        if( i_ret != SHOUTERR_SUCCESS )
-        {
-icy
+http
-            free( p_access->p_sys );
-            free( psz_accessname );
@@ -406 +398 @@
-        {
-            i_ret = SHOUTERR_CONNECTED;
-
+
+
+
+
-    }
-