diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:26:13 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:34:35 +0300 |
commit | 0eb321bf2c1cc0e048faff26a01f86cdd3ec254f (patch) | |
tree | 71cb9bd9ed121156d3382066c0722c73189afe04 /libao2/ao_pcm.c | |
parent | 6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 (diff) | |
download | mpv-0eb321bf2c1cc0e048faff26a01f86cdd3ec254f.tar.bz2 mpv-0eb321bf2c1cc0e048faff26a01f86cdd3ec254f.tar.xz |
Remove trailing whitespace from most files
Diffstat (limited to 'libao2/ao_pcm.c')
-rw-r--r-- | libao2/ao_pcm.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c index 8940107eec..8be3bdabb5 100644 --- a/libao2/ao_pcm.c +++ b/libao2/ao_pcm.c @@ -35,7 +35,7 @@ #include "help_mp.h" -static const ao_info_t info = +static const ao_info_t info = { "RAW PCM/WAVE file writer audio output", "pcm", @@ -149,13 +149,13 @@ static int init(int rate,int channels,int format,int flags){ wavhdr.bytes_per_second = le2me_32(ao_data.bps); wavhdr.bits = le2me_16(bits); wavhdr.block_align = le2me_16(ao_data.channels * (bits / 8)); - + wavhdr.data = le2me_32(WAV_ID_DATA); wavhdr.data_length=le2me_32(0x7ffff000); wavhdr.file_length = wavhdr.data_length + sizeof(wavhdr) - 8; - mp_tmsg(MSGT_AO, MSGL_INFO, "[AO PCM] File: %s (%s)\nPCM: Samplerate: %iHz Channels: %s Format %s\n", ao_outputfilename, - (ao_pcm_waveheader?"WAVE":"RAW PCM"), rate, + mp_tmsg(MSGT_AO, MSGL_INFO, "[AO PCM] File: %s (%s)\nPCM: Samplerate: %iHz Channels: %s Format %s\n", ao_outputfilename, + (ao_pcm_waveheader?"WAVE":"RAW PCM"), rate, (channels > 1) ? "Stereo" : "Mono", af_fmt2str_short(format)); mp_tmsg(MSGT_AO, MSGL_INFO, "[AO PCM] Info: Faster dumping is achieved with -vc null -vo null -ao pcm:fast\n[AO PCM] Info: To write WAVE files use -ao pcm:waveheader (default).\n"); @@ -166,14 +166,14 @@ static int init(int rate,int channels,int format,int flags){ } return 1; } - mp_tmsg(MSGT_AO, MSGL_ERR, "[AO PCM] Failed to open %s for writing!\n", + mp_tmsg(MSGT_AO, MSGL_ERR, "[AO PCM] Failed to open %s for writing!\n", ao_outputfilename); return 0; } // close audio device static void uninit(int immed){ - + if(ao_pcm_waveheader){ /* Rewrite wave header */ if (fseek(fp, 0, SEEK_SET) != 0) mp_msg(MSGT_AO, MSGL_ERR, "Could not seek to start, WAV size headers not updated!\n"); @@ -232,7 +232,7 @@ static int play(void* data,int len,int flags){ buffer[i] = le2me_16(buffer[i]); } } -#endif +#endif if (ao_data.channels == 6 || ao_data.channels == 5) { int frame_size = le2me_16(wavhdr.bits) / 8; @@ -248,7 +248,7 @@ static int play(void* data,int len,int flags){ if(ao_pcm_waveheader) data_length += len; - + return len; } @@ -257,9 +257,3 @@ static float get_delay(void){ return 0.0; } - - - - - - |