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

2 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 880195c3b..ea7f49ee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,8 +45,10 @@ xine-lib (1-rc1)
   * fix crasher in CDDA plugin
   * nvtv tvmode support removed from xine-lib. it is better suited in the
     frontends where it should be replaced with the new libnvtvsimple.
+  * Fix blocking on xine start when using alsa.
   * fix mp3 VBR length and pts computation
   * initial id3v2 support (id3v2.3 and id3v2.4 are not yet supported)
+  * Fix blocking on xine start when using alsa.
 
 xine-lib (1-rc0a)
   * includes ffmpeg's MPEG encode in dist tarball (fixes DXR3 support)
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; 
   }