/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <string.h>
-#include <stdlib.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <errno.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_codecs.h> /* WAVEHEADER */
+#include <vlc_charset.h>
#define FRAME_SIZE 2048
#define A52_FRAME_NB 1536
struct aout_sys_t
{
FILE * p_file;
- vlc_bool_t b_add_wav_header;
+ bool b_add_wav_header;
WAVEHEADER waveh; /* Wave header of the output file */
};
#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.")
+#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_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, VLC_TRUE );
+ FORMAT_TEXT, FORMAT_LONGTEXT, true );
change_string_list( format_list, 0, 0 );
add_integer( "audiofile-channels", 0, NULL,
- CHANNELS_TEXT, CHANNELS_LONGTEXT, VLC_TRUE );
+ CHANNELS_TEXT, CHANNELS_LONGTEXT, true );
add_file( "audiofile-file", "audiofile.wav", NULL, FILE_TEXT,
- FILE_LONGTEXT, VLC_FALSE );
- add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, VLC_TRUE );
+ FILE_LONGTEXT, false );
+ change_unsafe();
+ add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, true );
set_capability( "audio output", 0 );
add_shortcut( "file" );
if( !psz_name || !*psz_name )
{
msg_Err( p_aout, "you need to specify an output file name" );
- if( psz_name ) free( psz_name );
+ free( psz_name );
return VLC_EGENERIC;
}
/* 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;
+ else
+ p_aout->output.p_sys->p_file = utf8_fopen( psz_name, "wb" );
- p_aout->output.p_sys->p_file = utf8_fopen( psz_name, "wb" );
free( psz_name );
if ( p_aout->output.p_sys->p_file == NULL )
{
{
msg_Err( p_aout, "cannot understand the format string (%s)",
psz_format );
- fclose( p_aout->output.p_sys->p_file );
+ if( p_aout->output.p_sys->p_file != stdout )
+ fclose( p_aout->output.p_sys->p_file );
free( p_aout->output.p_sys );
return VLC_EGENERIC;
}
if( fwrite( wh, sizeof(WAVEHEADER), 1,
p_aout->output.p_sys->p_file ) != 1 )
{
- msg_Err( p_aout, "write error (%s)", strerror(errno) );
+ msg_Err( p_aout, "write error (%m)" );
}
}
/* Write Wave Header */
if( fseek( p_aout->output.p_sys->p_file, 0, SEEK_SET ) )
{
- msg_Err( p_aout, "seek error (%s)", strerror(errno) );
+ msg_Err( p_aout, "seek error (%m)" );
}
/* Header -> little endian format */
if( fwrite( &p_aout->output.p_sys->waveh, sizeof(WAVEHEADER), 1,
p_aout->output.p_sys->p_file ) != 1 )
{
- msg_Err( p_aout, "write error (%s)", strerror(errno) );
+ msg_Err( p_aout, "write error (%m)" );
}
}
- fclose( p_aout->output.p_sys->p_file );
+ if( p_aout->output.p_sys->p_file != stdout )
+ fclose( p_aout->output.p_sys->p_file );
free( p_aout->output.p_sys );
}
if( fwrite( p_buffer->p_buffer, p_buffer->i_nb_bytes, 1,
p_aout->output.p_sys->p_file ) != 1 )
{
- msg_Err( p_aout, "write error (%s)", strerror(errno) );
+ msg_Err( p_aout, "write error (%m)" );
}
if( p_aout->output.p_sys->b_add_wav_header )