X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Ffile.c;h=f6f851aa436c976444c80f1d8ed5e6adf7f536ad;hb=a9e5a068853be523efda8ae2573e3184cf1bd3cc;hp=f7dde4c07ec2b0f6d794cca485435b7ff4e75a09;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index f7dde4c07e..f6f851aa43 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -25,13 +25,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include + +#include +#include #include #include /* WAVEHEADER */ #include @@ -54,7 +56,7 @@ struct aout_sys_t }; #define CHANNELS_MAX 6 -static int pi_channels_maps[CHANNELS_MAX+1] = +static const int pi_channels_maps[CHANNELS_MAX+1] = { 0, AOUT_CHAN_CENTER, @@ -90,44 +92,43 @@ static void Play ( aout_instance_t * ); #define WAV_LONGTEXT N_("Instead of writing a raw file, you can add a WAV " \ "header to the file.") -static const char *format_list[] = { "u8", "s8", "u16", "s16", "u16_le", +static const char *const format_list[] = { "u8", "s8", "u16", "s16", "u16_le", "s16_le", "u16_be", "s16_be", "fixed32", "float32", "spdif" }; -static int format_int[] = { VLC_FOURCC('u','8',' ',' '), - VLC_FOURCC('s','8',' ',' '), - AOUT_FMT_U16_NE, AOUT_FMT_S16_NE, - VLC_FOURCC('u','1','6','l'), - VLC_FOURCC('s','1','6','l'), - VLC_FOURCC('u','1','6','b'), - VLC_FOURCC('s','1','6','b'), - VLC_FOURCC('f','i','3','2'), - VLC_FOURCC('f','l','3','2'), - VLC_FOURCC('s','p','i','f') }; +static const int format_int[] = { VLC_FOURCC('u','8',' ',' '), + VLC_FOURCC('s','8',' ',' '), + AOUT_FMT_U16_NE, AOUT_FMT_S16_NE, + VLC_FOURCC('u','1','6','l'), + VLC_FOURCC('s','1','6','l'), + VLC_FOURCC('u','1','6','b'), + VLC_FOURCC('s','1','6','b'), + VLC_FOURCC('f','i','3','2'), + VLC_FOURCC('f','l','3','2'), + VLC_FOURCC('s','p','i','f') }; #define FILE_TEXT N_("Output file") #define FILE_LONGTEXT N_("File to which the audio samples will be written to. (\"-\" for stdout") -vlc_module_begin(); - set_description( _("File audio output") ); - set_shortname( _("File") ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); +vlc_module_begin () + set_description( N_("File audio output") ) + set_shortname( N_("File") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) add_string( "audiofile-format", "s16", NULL, - FORMAT_TEXT, FORMAT_LONGTEXT, true ); - change_string_list( format_list, 0, 0 ); + FORMAT_TEXT, FORMAT_LONGTEXT, true ) + change_string_list( format_list, 0, 0 ) add_integer( "audiofile-channels", 0, NULL, - CHANNELS_TEXT, CHANNELS_LONGTEXT, true ); + CHANNELS_TEXT, CHANNELS_LONGTEXT, true ) add_file( "audiofile-file", "audiofile.wav", NULL, FILE_TEXT, - FILE_LONGTEXT, false ); - change_unsafe(); - add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, true ); + FILE_LONGTEXT, false ) + add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, true ) - set_capability( "audio output", 0 ); - add_shortcut( "file" ); - add_shortcut( "audiofile" ); - set_callbacks( Open, Close ); -vlc_module_end(); + set_capability( "audio output", 0 ) + add_shortcut( "file" ) + add_shortcut( "audiofile" ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: open a dummy audio device @@ -136,13 +137,10 @@ static int Open( vlc_object_t * p_this ) { aout_instance_t * p_aout = (aout_instance_t *)p_this; char * psz_name, * psz_format; - const char ** ppsz_compare = format_list; - vlc_value_t val; + const char * const * ppsz_compare = format_list; int i_channels, i = 0; - var_Create( p_this, "audiofile-file", VLC_VAR_STRING|VLC_VAR_DOINHERIT ); - var_Get( p_this, "audiofile-file", &val ); - psz_name = val.psz_string; + psz_name = var_CreateGetString( p_this, "audiofile-file" ); if( !psz_name || !*psz_name ) { msg_Err( p_aout, "you need to specify an output file name" ); @@ -153,10 +151,7 @@ static int Open( vlc_object_t * p_this ) /* Allocate structure */ p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); if( p_aout->output.p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; if( !strcmp( psz_name, "-" ) ) p_aout->output.p_sys->p_file = stdout; @@ -173,9 +168,7 @@ static int Open( vlc_object_t * p_this ) p_aout->output.pf_play = Play; /* Audio format */ - var_Create( p_this, "audiofile-format", VLC_VAR_STRING|VLC_VAR_DOINHERIT ); - var_Get( p_this, "audiofile-format", &val ); - psz_format = val.psz_string; + psz_format = var_CreateGetString( p_this, "audiofile-format" ); while ( *ppsz_compare != NULL ) { @@ -193,8 +186,10 @@ static int Open( vlc_object_t * p_this ) if( p_aout->output.p_sys->p_file != stdout ) fclose( p_aout->output.p_sys->p_file ); free( p_aout->output.p_sys ); + free( psz_format ); return VLC_EGENERIC; } + free( psz_format ); p_aout->output.output.i_format = format_int[i]; if ( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) ) @@ -211,10 +206,7 @@ static int Open( vlc_object_t * p_this ) } /* Channels number */ - var_Create( p_this, "audiofile-channels", - VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Get( p_this, "audiofile-channels", &val ); - i_channels = val.i_int; + i_channels = var_CreateGetInteger( p_this, "audiofile-channels" ); if( i_channels > 0 && i_channels <= CHANNELS_MAX ) { @@ -223,9 +215,8 @@ static int Open( vlc_object_t * p_this ) } /* WAV header */ - var_Create( p_this, "audiofile-wav", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); - var_Get( p_this, "audiofile-wav", &val ); - p_aout->output.p_sys->b_add_wav_header = val.b_bool; + p_aout->output.p_sys->b_add_wav_header = var_CreateGetBool( p_this, + "audiofile-wav" ); if( p_aout->output.p_sys->b_add_wav_header ) {