From 59fa1f90d5968b9bcf9ae2b72af15b206a92c3ca Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 14 Jan 2008 12:49:21 -0800 Subject: [PATCH] Don't attempt to recover the ALSA stream when filling silence Since it was just prepared, any error would likely mean bigger problems --- Alc/alsa.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Alc/alsa.c b/Alc/alsa.c index e76b8504..8bc6d903 100644 --- a/Alc/alsa.c +++ b/Alc/alsa.c @@ -275,12 +275,8 @@ static void fill_silence(snd_pcm_t *pcmHandle, snd_pcm_format_t alsaFormat, int avail = psnd_pcm_avail_update(pcmHandle); if(avail < 0) { - err = xrun_recovery(pcmHandle, avail); - if (err < 0) - { - AL_PRINT("available update failed: %s\n", psnd_strerror(err)); - return; - } + AL_PRINT("available update failed: %s\n", psnd_strerror(avail)); + return; } // it is possible that contiguous areas are smaller, thus we use a loop @@ -291,13 +287,8 @@ static void fill_silence(snd_pcm_t *pcmHandle, snd_pcm_format_t alsaFormat, int err = psnd_pcm_mmap_begin(pcmHandle, &areas, &offset, &frames); if (err < 0) { - err = xrun_recovery(pcmHandle, err); - if (err < 0) - { - AL_PRINT("mmap begin error: %s\n", psnd_strerror(err)); - break; - } - continue; + AL_PRINT("mmap begin error: %s\n", psnd_strerror(err)); + break; } psnd_pcm_areas_silence(areas, offset, channels, frames, alsaFormat); -- 2.11.4.GIT