diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-14 20:36:26 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-14 20:36:26 +0000 |
| commit | ff88b3588bd4a4b70ac9c26d76f856b1356b3c75 (patch) | |
| tree | f514b996a72620c70bd4fc8706b83d408e023c0e /libao2 | |
| parent | 6a4fcecaed18d1e938c6b0fbb9bb535eebeebae5 (diff) | |
| download | mpv-ff88b3588bd4a4b70ac9c26d76f856b1356b3c75.tar.bz2 mpv-ff88b3588bd4a4b70ac9c26d76f856b1356b3c75.tar.xz | |
replace snd_pcm_drain with snd_pcm_drop
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9588 b3059339-0415-0410-9bf9-f77b7e298cf2
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 |