Commit 8bf0d77a authored by Antoine Cellerier's avatar Antoine Cellerier

:%s/\t/ /g

parent f7461fc4
...@@ -289,10 +289,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -289,10 +289,10 @@ static int Open( vlc_object_t *p_this )
} }
else else
{ {
/* Bitrate information is used for icecast/shoutcast servers directory /* Bitrate information is used for icecast/shoutcast servers directory
listings (sorting, stream info etc.) */ listings (sorting, stream info etc.) */
msg_Warn( p_access, "no bitrate information specified (required for listing " \ msg_Warn( p_access, "no bitrate information specified (required for listing " \
"the server as public on the shoutcast website)" ); "the server as public on the shoutcast website)" );
free( val.psz_string ); free( val.psz_string );
} }
...@@ -369,13 +369,13 @@ static int Open( vlc_object_t *p_this ) ...@@ -369,13 +369,13 @@ static int Open( vlc_object_t *p_this )
} }
else else
{ {
/* If default 'http' protocol for icecast 2.x fails, fall back to 'icy' /* If default 'http' protocol for icecast 2.x fails, fall back to 'icy'
for shoutcast server */ for shoutcast server */
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, "
"switching to 'icy' (shoutcast)" ); "switching to 'icy' (shoutcast)" );
i_ret = shout_get_format( p_shout ); i_ret = shout_get_format( p_shout );
if( i_ret != SHOUT_FORMAT_MP3 ) if( i_ret != SHOUT_FORMAT_MP3 )
{ {
msg_Err( p_access, "failed to use 'icy' protocol: only MP3 " \ msg_Err( p_access, "failed to use 'icy' protocol: only MP3 " \
"streaming to shoutcast is supported" ); "streaming to shoutcast is supported" );
...@@ -384,14 +384,14 @@ static int Open( vlc_object_t *p_this ) ...@@ -384,14 +384,14 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
/* Shout parameters cannot be changed on an open connection */ /* Shout parameters cannot be changed on an open connection */
i_ret = shout_close( p_shout ); i_ret = shout_close( p_shout );
if( i_ret == SHOUTERR_SUCCESS ) if( i_ret == SHOUTERR_SUCCESS )
{ {
i_ret = SHOUTERR_UNCONNECTED; i_ret = SHOUTERR_UNCONNECTED;
} }
i_ret = shout_set_protocol( p_shout, SHOUT_PROTOCOL_ICY ); i_ret = shout_set_protocol( p_shout, SHOUT_PROTOCOL_ICY );
if( i_ret != SHOUTERR_SUCCESS ) if( i_ret != SHOUTERR_SUCCESS )
{ {
msg_Err( p_access, "failed to set the protocol to 'icy'" ); msg_Err( p_access, "failed to set the protocol to 'icy'" );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment