asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-08 19:45:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsabat: use general function for wav header update

Browse source 
In playback thread, use general function update_wav_header()
to replace a bunch of code, so the structure is cleaner and
no need to define variable "wav".

Signed-off-by: Lu, Han <han.lu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Lu, Han 2016-03-23 15:52:43 +08:00 committed by Takashi Iwai
parent 241d7fc1bb
commit 2c37a6f9c4
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bat/alsa.c
View file

@ -292,11 +292,10 @@ static int write_to_pcm(const struct pcm_container *sndpcm,
static int write_to_pcm_loop(struct pcm_container *sndpcm, struct bat *bat)
{
int err;
int err = 0;
int bytes = sndpcm->period_bytes; /* playback buffer size */
int frames = bytes * 8 / sndpcm->frame_bits; /* frame count */
FILE *fp = NULL;
struct wav_container wav;
int bytes_total = 0;
if (bat->debugplay) {
@ -308,7 +307,7 @@ static int write_to_pcm_loop(struct pcm_container *sndpcm, struct bat *bat)
return err;
}
/* leave space for wav header */
if (fseek(fp, sizeof(wav), SEEK_SET) != 0) {
if (fseek(fp, sizeof(struct wav_container), SEEK_SET) != 0) {
err = -errno;
fclose(fp);
return err;
@ -344,19 +343,7 @@ static int write_to_pcm_loop(struct pcm_container *sndpcm, struct bat *bat)
}
if (bat->debugplay) {
/* update wav header */
prepare_wav_info(&wav, bat);
wav.chunk.length = bytes_total;
wav.header.length = (wav.chunk.length) + sizeof(wav.chunk)
+ sizeof(wav.format) + sizeof(wav.header) - 8;
rewind(fp);
err = write_wav_header(fp, &wav, bat);
if (err != 0) {
fprintf(bat->err, _("Write file error: %s %s(%d)\n"),
bat->debugplay, snd_strerror(err), err);
return err;
}
update_wav_header(bat, fp, bytes_total);
fclose(fp);
}