aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/alsa.c
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2008-01-14 12:49:21 -0800
committerChris Robinson <[email protected]>2008-01-14 12:49:21 -0800
commit59fa1f90d5968b9bcf9ae2b72af15b206a92c3ca (patch)
treed60ced2fbaf79ee8a49259d511d21a0ecdd17df7 /Alc/alsa.c
parente519338a2b394680261afe15417403e07145b318 (diff)
Don't attempt to recover the ALSA stream when filling silence
Since it was just prepared, any error would likely mean bigger problems
Diffstat (limited to 'Alc/alsa.c')
-rw-r--r--Alc/alsa.c17
1 files 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);