X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess_output%2Fshout.c;h=6fc3a47f4c5beb3a51b390891a70f951afbb3b9d;hb=a78e7a5cf40455f88e664d4f42427196fa27d427;hp=d3eea7f894d16444c31dbee29bdb88245aa01fd9;hpb=6b822f38be4f5958b1e271324bc73f4a7a98b0bc;p=vlc diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c index d3eea7f894..6fc3a47f4c 100644 --- a/modules/access_output/shout.c +++ b/modules/access_output/shout.c @@ -41,7 +41,12 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -101,41 +106,41 @@ static void Close( vlc_object_t * ); "website. Requires the bitrate information specified for " \ "shoutcast. Requires Ogg streaming for icecast." ) -vlc_module_begin(); - set_description( _("IceCAST output") ); - set_shortname( "Shoutcast" ); - set_capability( "sout access", 50 ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_ACO ); - add_shortcut( "shout" ); +vlc_module_begin () + set_description( N_("IceCAST output") ) + set_shortname( "Shoutcast" ) + set_capability( "sout access", 50 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_ACO ) + add_shortcut( "shout" ) add_string( SOUT_CFG_PREFIX "name", "VLC media player - Live stream", NULL, - NAME_TEXT, NAME_LONGTEXT, VLC_FALSE ); + NAME_TEXT, NAME_LONGTEXT, false ); add_string( SOUT_CFG_PREFIX "description", "Live stream from VLC media player", NULL, - DESCRIPTION_TEXT, DESCRIPTION_LONGTEXT, VLC_FALSE ); - add_bool( SOUT_CFG_PREFIX "mp3", VLC_FALSE, NULL, - MP3_TEXT, MP3_LONGTEXT, VLC_TRUE ); + DESCRIPTION_TEXT, DESCRIPTION_LONGTEXT, false ); + add_bool( SOUT_CFG_PREFIX "mp3", false, NULL, + MP3_TEXT, MP3_LONGTEXT, true ); add_string( SOUT_CFG_PREFIX "genre", "Alternative", NULL, - GENRE_TEXT, GENRE_LONGTEXT, VLC_FALSE ); + GENRE_TEXT, GENRE_LONGTEXT, false ); add_string( SOUT_CFG_PREFIX "url", "http://www.videolan.org/vlc", NULL, - URL_TEXT, URL_LONGTEXT, VLC_FALSE ); + URL_TEXT, URL_LONGTEXT, false ); add_string( SOUT_CFG_PREFIX "bitrate", "", NULL, - BITRATE_TEXT, BITRATE_LONGTEXT, VLC_FALSE ); + BITRATE_TEXT, BITRATE_LONGTEXT, false ); add_string( SOUT_CFG_PREFIX "samplerate", "", NULL, - SAMPLERATE_TEXT, SAMPLERATE_LONGTEXT, VLC_FALSE ); + SAMPLERATE_TEXT, SAMPLERATE_LONGTEXT, false ); add_string( SOUT_CFG_PREFIX "channels", "", NULL, - CHANNELS_TEXT, CHANNELS_LONGTEXT, VLC_FALSE ); + CHANNELS_TEXT, CHANNELS_LONGTEXT, false ); add_string( SOUT_CFG_PREFIX "quality", "", NULL, - QUALITY_TEXT, QUALITY_LONGTEXT, VLC_FALSE ); - add_bool( SOUT_CFG_PREFIX "public", VLC_FALSE, NULL, - PUBLIC_TEXT, PUBLIC_LONGTEXT, VLC_TRUE ); - set_callbacks( Open, Close ); -vlc_module_end(); + QUALITY_TEXT, QUALITY_LONGTEXT, false ); + add_bool( SOUT_CFG_PREFIX "public", false, NULL, + PUBLIC_TEXT, PUBLIC_LONGTEXT, true ); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static const char *ppsz_sout_options[] = { +static const char *const ppsz_sout_options[] = { "name", "description", "mp3", "genre", "url", "bitrate", "samplerate", "channels", "quality", "public", NULL }; @@ -146,6 +151,7 @@ static const char *ppsz_sout_options[] = { *****************************************************************************/ static ssize_t Write( sout_access_out_t *, block_t * ); static int Seek ( sout_access_out_t *, off_t ); +static int Control( sout_access_out_t *, int, va_list ); struct sout_access_out_sys_t { @@ -178,8 +184,6 @@ static int Open( vlc_object_t *p_this ) config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg ); - psz_accessname = psz_parser = strdup( p_access->psz_path ); - if( !p_access->psz_path ) { msg_Err( p_access, @@ -187,6 +191,10 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } + psz_accessname = psz_parser = strdup( p_access->psz_path ); + if( !psz_parser ) + return VLC_ENOMEM; + /* Parse connection data user:pwd@host:port/mountpoint */ psz_user = psz_parser; while( psz_parser[0] && psz_parser[0] != ':' ) psz_parser++; @@ -207,7 +215,6 @@ static int Open( vlc_object_t *p_this ) p_sys = p_access->p_sys = malloc( sizeof( sout_access_out_sys_t ) ); if( !p_sys ) { - msg_Err( p_access, "out of memory" ); free( psz_accessname ); return VLC_ENOMEM; } @@ -256,16 +263,20 @@ static int Open( vlc_object_t *p_this ) psz_host, i_port, psz_mount ); free( p_access->p_sys ); free( psz_accessname ); + free( psz_name ); + free( psz_description ); + free( psz_genre ); + free( psz_url ); return VLC_EGENERIC; } - if( psz_name ) free( psz_name ); - if( psz_description ) free( psz_description ); - if( psz_genre ) free( psz_genre ); - if( psz_url ) free( psz_url ); + free( psz_name ); + free( psz_description ); + free( psz_genre ); + free( psz_url ); var_Get( p_access, SOUT_CFG_PREFIX "mp3", &val ); - if( val.b_bool == VLC_TRUE ) + if( val.b_bool == true ) i_ret = shout_set_format( p_shout, SHOUT_FORMAT_MP3 ); else i_ret = shout_set_format( p_shout, SHOUT_FORMAT_OGG ); @@ -287,6 +298,7 @@ static int Open( vlc_object_t *p_this ) if( i_ret != SHOUTERR_SUCCESS ) { msg_Err( p_access, "failed to set the information about the bitrate" ); + free( val.psz_string ); free( p_access->p_sys ); free( psz_accessname ); return VLC_EGENERIC; @@ -312,6 +324,7 @@ static int Open( vlc_object_t *p_this ) if( i_ret != SHOUTERR_SUCCESS ) { msg_Err( p_access, "failed to set the information about the samplerate" ); + free( val.psz_string ); free( p_access->p_sys ); free( psz_accessname ); return VLC_EGENERIC; @@ -327,6 +340,7 @@ static int Open( vlc_object_t *p_this ) if( i_ret != SHOUTERR_SUCCESS ) { msg_Err( p_access, "failed to set the information about the number of channels" ); + free( val.psz_string ); free( p_access->p_sys ); free( psz_accessname ); return VLC_EGENERIC; @@ -342,6 +356,7 @@ static int Open( vlc_object_t *p_this ) if( i_ret != SHOUTERR_SUCCESS ) { msg_Err( p_access, "failed to set the information about Ogg Vorbis quality" ); + free( val.psz_string ); free( p_access->p_sys ); free( psz_accessname ); return VLC_EGENERIC; @@ -351,7 +366,7 @@ static int Open( vlc_object_t *p_this ) free( val.psz_string ); var_Get( p_access, SOUT_CFG_PREFIX "public", &val ); - if( val.b_bool == VLC_TRUE ) + if( val.b_bool == true ) { i_ret = shout_set_public( p_shout, 1 ); if( i_ret != SHOUTERR_SUCCESS ) @@ -445,16 +460,10 @@ static int Open( vlc_object_t *p_this ) p_access->pf_write = Write; p_access->pf_seek = Seek; + p_access->pf_control = Control; msg_Dbg( p_access, "shout access output opened (%s@%s:%i/%s)", psz_user, psz_host, i_port, psz_mount ); - - /* Update pace control flag */ - if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) ) - { - p_access->p_sout->i_out_pace_nocontrol++; - } - free( psz_accessname ); return VLC_SUCCESS; @@ -473,14 +482,24 @@ static void Close( vlc_object_t * p_this ) shout_shutdown(); } free( p_access->p_sys ); + msg_Dbg( p_access, "shout access output closed" ); +} - /* Update pace control flag */ - if( p_access->psz_access && !strcmp( p_access->psz_access, "stream" ) ) +static int Control( sout_access_out_t *p_access, int i_query, va_list args ) +{ + switch( i_query ) { - p_access->p_sout->i_out_pace_nocontrol--; - } + case ACCESS_OUT_CONTROLS_PACE: + { + bool *pb = va_arg( args, bool * ); + *pb = strcmp( p_access->psz_access, "stream" ); + break; + } - msg_Dbg( p_access, "shout access output closed" ); + default: + return VLC_EGENERIC; + } + return VLC_SUCCESS; } /***************************************************************************** @@ -521,6 +540,8 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) else { msg_Err( p_access, "failed to reconnect to server" ); + block_ChainRelease (p_buffer); + return VLC_EGENERIC; } }