diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-02 14:41:47 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-02 14:41:47 +0000 |
| commit | eca47b1a5edae0c25936c73ce60fa2a45ac42155 (patch) | |
| tree | 7fc7fb7d2964bbb7fb45c4b25707830ab79fe837 /libao2/ao_pcm.c | |
| parent | e73aadd97b8d6ba6934783823ae533038cfdbed1 (diff) | |
| download | mpv-eca47b1a5edae0c25936c73ce60fa2a45ac42155.tar.bz2 mpv-eca47b1a5edae0c25936c73ce60fa2a45ac42155.tar.xz | |
Add -ao pcm suboptions and remove -aofile and -waveheader options.
Base on idea by Olivier Rolland (billl at users dot sf dot net)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14299 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_pcm.c')
| -rw-r--r-- | libao2/ao_pcm.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c index 4d97f95fc5..ba11490baf 100644 --- a/libao2/ao_pcm.c +++ b/libao2/ao_pcm.c @@ -5,6 +5,7 @@ #include <string.h> #include "bswap.h" +#include "subopt-helper.h" #include "libaf/af_format.h" #include "audio_out.h" #include "audio_out_internal.h" @@ -24,8 +25,8 @@ LIBAO_EXTERN(pcm) extern int vo_pts; -char *ao_outputfilename = NULL; -int ao_pcm_waveheader = 1; +static char *ao_outputfilename = NULL; +static int ao_pcm_waveheader = 1; #define WAV_ID_RIFF 0x46464952 /* "RIFF" */ #define WAV_ID_WAVE 0x45564157 /* "WAVE" */ @@ -79,9 +80,20 @@ static int control(int cmd,void *arg){ // return: 1=success 0=fail static int init(int rate,int channels,int format,int flags){ int bits; - if(!ao_outputfilename) { - ao_outputfilename = strdup(ao_pcm_waveheader ? "audiodump.wav" : "audiodump.pcm"); + strarg_t file; + opt_t subopts[] = { + {"waveheader", OPT_ARG_BOOL, &ao_pcm_waveheader, NULL}, + {"file", OPT_ARG_STR, &file, NULL}, + {NULL} } + // set defaults + ao_pcm_waveheader = 1; + file.str = "audiodump.wav"; + file.len = 13; + if (subopt_parse(ao_subdevice, subopts) != 0) { + return 0; + } + ao_outputfilename = strndup(file.str, file.len); /* bits is only equal to format if (format == 8) or (format == 16); this means that the following "if" is a kludge and should @@ -142,6 +154,9 @@ static void uninit(int immed){ fwrite(&wavhdr,sizeof(wavhdr),1,fp); } fclose(fp); + if (ao_outputfilename) + free(ao_outputfilename); + ao_outputfilename = NULL; } // stop playing and empty buffers (for seeking/pause) |