summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2003-10-04 22:27:58 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2003-10-04 22:27:58 +0000
commit70768558c8a2c34f2cce7a3721c40af89eade2f6 (patch)
tree66a08e1f6e0dcdc25ea8e683bde076f9b904fe1f /src
parentd2405ec55123737ac4f73702ebf41726701cad11 (diff)
downloadxine-lib-70768558c8a2c34f2cce7a3721c40af89eade2f6.tar.gz
xine-lib-70768558c8a2c34f2cce7a3721c40af89eade2f6.tar.bz2
Fix blocking on xine start when using alsa.
Fixes bug: - http://bugs.debian.org/211304 CVS patchset: 5442 CVS date: 2003/10/04 22:27:58
Diffstat (limited to 'src')
-rw-r--r--src/audio_out/audio_alsa_out.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 77d212410..76339f341 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
* (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
*
*
- * $Id: audio_alsa_out.c,v 1.110 2003/09/27 14:59:43 jcdutton Exp $
+ * $Id: audio_alsa_out.c,v 1.111 2003/10/04 22:27:58 jcdutton Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1261,12 +1261,12 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
/*
* open that device
*/
- err=snd_pcm_open(&this->audio_fd, pcm_device, SND_PCM_STREAM_PLAYBACK, 0);
+ err=snd_pcm_open(&this->audio_fd, pcm_device, SND_PCM_STREAM_PLAYBACK, 1); /* NON-BLOCK mode */
if(err <0 ) {
xine_log (this->class->xine, XINE_LOG_MSG,
- "snd_pcm_open() failed: %d", err);
+ "snd_pcm_open() failed:%d:%s\n", err, snd_strerror(err));
xine_log (this->class->xine, XINE_LOG_MSG,
- ">>> Check if another program don't already use PCM <<<");
+ ">>> Check if another program don't already use PCM <<<\n");
return NULL;
}