RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 23:32:26 +00:00
Code Issues Releases Wiki Activity

patch from Pierre Lombard <p_l@gmx.fr>

Browse Source 
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).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10899 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
attila 2003-09-21 09:49:05 +00:00
parent 5df4253e55
commit 81e60cd6bb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libao2/ao_alsa1x.c
View File

@ -503,7 +503,7 @@ static int init(int rate_hz, int channels, int format, int flags)
//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));

2
libao2/ao_alsa9.c
View File

@ -503,7 +503,7 @@ static int init(int rate_hz, int channels, int format, int flags)
//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));