diff options
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_alsa1x.c | 27 | ||||
| -rw-r--r-- | libao2/ao_alsa9.c | 27 |
2 files changed, 20 insertions, 34 deletions
diff --git a/libao2/ao_alsa1x.c b/libao2/ao_alsa1x.c index b171c93dd8..0534e77db2 100644 --- a/libao2/ao_alsa1x.c +++ b/libao2/ao_alsa1x.c @@ -750,24 +750,17 @@ static void reset() { int err; - if (!ao_noblock) { - //drain causes error in nonblock-mode! - if ((err = snd_pcm_drain(alsa_handler)) < 0) - { - printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err)); - return; - } - - if ((err = snd_pcm_prepare(alsa_handler)) < 0) - { - printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err)); - return; - } - } else { - if (verbose>0) - printf("alsa-reset: reset nonblocked"); - return; + if ((err = snd_pcm_drop(alsa_handler)) < 0) + { + printf("alsa-reset: pcm drop error: %s\n", snd_strerror(err)); + return; + } + if ((err = snd_pcm_prepare(alsa_handler)) < 0) + { + printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err)); + return; } + return; } #ifdef USE_POLL diff --git a/libao2/ao_alsa9.c b/libao2/ao_alsa9.c index b171c93dd8..0534e77db2 100644 --- a/libao2/ao_alsa9.c +++ b/libao2/ao_alsa9.c @@ -750,24 +750,17 @@ static void reset() { int err; - if (!ao_noblock) { - //drain causes error in nonblock-mode! - if ((err = snd_pcm_drain(alsa_handler)) < 0) - { - printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err)); - return; - } - - if ((err = snd_pcm_prepare(alsa_handler)) < 0) - { - printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err)); - return; - } - } else { - if (verbose>0) - printf("alsa-reset: reset nonblocked"); - return; + if ((err = snd_pcm_drop(alsa_handler)) < 0) + { + printf("alsa-reset: pcm drop error: %s\n", snd_strerror(err)); + return; + } + if ((err = snd_pcm_prepare(alsa_handler)) < 0) + { + printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err)); + return; } + return; } #ifdef USE_POLL |