Mercurial > mplayer.hg
changeset 10898:716edc005b18
patch from Pierre Lombard <p_l@gmx.fr>
If the sound channel is already busy the async open fails and returns
-EBUSY. There's no need to try to open it synchronously as it will block
mplayer till the sound channel is released.
(Granted there's a very slight chance your sound device happen to be
freed between those two calls but it's not the common case).
The behavior is changed by this oneliner to match the ao_oss behavior
(disable sound if the sound device is busy).
| author | attila |
|---|---|
| date | Sun, 21 Sep 2003 09:49:05 +0000 |
| parents | ee9d3d88020a |
| children | fbd70b450d32 |
| files | libao2/ao_alsa1x.c libao2/ao_alsa9.c |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_alsa1x.c Sun Sep 21 09:09:46 2003 +0000 +++ b/libao2/ao_alsa1x.c Sun Sep 21 09:49:05 2003 +0000 @@ -503,7 +503,7 @@ //modes = 0, SND_PCM_NONBLOCK, SND_PCM_ASYNC if ((err = snd_pcm_open(&alsa_handler, alsa_device, SND_PCM_STREAM_PLAYBACK, open_mode)) < 0) { - if (ao_noblock) { + if (err != -EBUSY && ao_noblock) { printf("alsa-init: open in nonblock-mode failed, trying to open in block-mode\n"); if ((err = snd_pcm_open(&alsa_handler, alsa_device, SND_PCM_STREAM_PLAYBACK, 0)) < 0) { printf("alsa-init: playback open error: %s\n", snd_strerror(err));
--- a/libao2/ao_alsa9.c Sun Sep 21 09:09:46 2003 +0000 +++ b/libao2/ao_alsa9.c Sun Sep 21 09:49:05 2003 +0000 @@ -503,7 +503,7 @@ //modes = 0, SND_PCM_NONBLOCK, SND_PCM_ASYNC if ((err = snd_pcm_open(&alsa_handler, alsa_device, SND_PCM_STREAM_PLAYBACK, open_mode)) < 0) { - if (ao_noblock) { + if (err != -EBUSY && ao_noblock) { printf("alsa-init: open in nonblock-mode failed, trying to open in block-mode\n"); if ((err = snd_pcm_open(&alsa_handler, alsa_device, SND_PCM_STREAM_PLAYBACK, 0)) < 0) { printf("alsa-init: playback open error: %s\n", snd_strerror(err));