oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/alsa: move code to alsa_write_silence()

Browse Source
This commit is contained in:
Max Kellermann 2013-02-04 14:29:15 +01:00
parent 00baddcd9e
commit e06dd129dd
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/output/AlsaOutputPlugin.cxx
View File

@ -682,6 +682,28 @@ alsa_open(struct audio_output *ao, struct audio_format *audio_format, GError **e
return true; return true;
} }
/**
* Write silence to the ALSA device.
*/
static void
alsa_write_silence(AlsaOutput *ad, snd_pcm_uframes_t nframes)
{
size_t nbytes = nframes * ad->out_frame_size;
void *buffer = g_malloc(nbytes);
snd_pcm_hw_params_t *params;
snd_pcm_format_t format;
unsigned channels;
snd_pcm_hw_params_alloca(&params);
snd_pcm_hw_params_current(ad->pcm, params);
snd_pcm_hw_params_get_format(params, &format);
snd_pcm_hw_params_get_channels(params, &channels);
snd_pcm_format_set_silence(format, buffer, nframes * channels);
ad->writei(ad->pcm, buffer, nframes);
g_free(buffer);
}
static int static int
alsa_recover(AlsaOutput *ad, int err) alsa_recover(AlsaOutput *ad, int err)
{ {
@ -732,20 +754,7 @@ alsa_drain(struct audio_output *ao)
period */ period */
snd_pcm_uframes_t nframes = snd_pcm_uframes_t nframes =
ad->period_frames - ad->period_position; ad->period_frames - ad->period_position;
size_t nbytes = nframes * ad->out_frame_size; alsa_write_silence(ad, nframes);
void *buffer = g_malloc(nbytes);
snd_pcm_hw_params_t *params;
snd_pcm_format_t format;
unsigned channels;
snd_pcm_hw_params_alloca(&params);
snd_pcm_hw_params_current(ad->pcm, params);
snd_pcm_hw_params_get_format(params, &format);
snd_pcm_hw_params_get_channels(params, &channels);
snd_pcm_format_set_silence(format, buffer, nframes * channels);
ad->writei(ad->pcm, buffer, nframes);
g_free(buffer);
} }
snd_pcm_drain(ad->pcm); snd_pcm_drain(ad->pcm);