3 files changed, 37 insertions, 18 deletions

diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index e92bfbb3a..4ce2b1be3 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -856,7 +856,11 @@ static int ao_alsa_write(ao_driver_t *this_gen, int16_t *data, uint32_t count) {
 static void ao_alsa_close(ao_driver_t *this_gen) {
   alsa_driver_t *this = (alsa_driver_t *) this_gen;
 
-  if(this->audio_fd) snd_pcm_close(this->audio_fd);
+  if(this->audio_fd) {
+    snd_pcm_nonblock(this->audio_fd, 0);
+    snd_pcm_drain(this->audio_fd);
+    snd_pcm_close(this->audio_fd);
+  }
   this->audio_fd = NULL;
   this->has_pause_resume = 0; /* This is set at open time */
 }
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index f8a4437a4..2a69c4da2 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -242,7 +242,7 @@ static int read_ogg_packet (demux_ogg_t *this) {
     bytes  = this->input->read(this->input, buffer, CHUNKSIZE);
     if (bytes == 0) {
       if (total == 0) {
-        printf("read_ogg_packet read nothing\n");
+        lprintf("read_ogg_packet read nothing\n");
         return 0;
       }
       break;
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 76d678aa2..aac1739aa 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -342,9 +342,7 @@ static void fifo_append (audio_fifo_t *fifo,
   pthread_mutex_unlock (&fifo->mutex);
 }
 
-static audio_buffer_t *fifo_remove_int (audio_fifo_t *fifo, int blocking) {
-  audio_buffer_t *buf;
-
+static audio_buffer_t *fifo_peek_int (audio_fifo_t *fifo, int blocking) {
   while (!fifo->first) {
     pthread_cond_signal (&fifo->empty);
     if (blocking)
@@ -359,25 +357,38 @@ static audio_buffer_t *fifo_remove_int (audio_fifo_t *fifo, int blocking) {
         return NULL;
     }
   }
+  return fifo->first;
+}
 
-  buf = fifo->first;
-
-  if (buf) {
-    fifo->first = buf->next;
+static audio_buffer_t *fifo_remove_int (audio_fifo_t *fifo, int blocking) {
+  audio_buffer_t *buf = fifo_peek_int(fifo, blocking);
+  if (!buf)
+    return NULL;
 
-    if (!fifo->first) {
+  fifo->first = buf->next;
 
-      fifo->last = NULL;
-      fifo->num_buffers = 0;
-      pthread_cond_signal (&fifo->empty);
+  if (!fifo->first) {
 
-    } else 
-      fifo->num_buffers--;
+    fifo->last = NULL;
+    fifo->num_buffers = 0;
+    pthread_cond_signal (&fifo->empty);
 
-  }
+  } else
+    fifo->num_buffers--;
 
   buf->next = NULL;
-    
+
+  return buf;
+}
+
+static audio_buffer_t *fifo_peek (audio_fifo_t *fifo) {
+
+  audio_buffer_t *buf;
+
+  pthread_mutex_lock (&fifo->mutex);
+  buf = fifo_peek_int(fifo, 1);
+  pthread_mutex_unlock (&fifo->mutex);
+
   return buf;
 }
 
@@ -1000,7 +1011,7 @@ static void *ao_loop (void *this_gen) {
     
     if (!in_buf) {
       lprintf ("loop: get buf from fifo\n");
-      in_buf = fifo_remove (this->out_fifo);
+      in_buf = fifo_peek (this->out_fifo);
       bufs_since_sync++;
       lprintf ("got a buffer\n");
     }
@@ -1013,6 +1024,7 @@ static void *ao_loop (void *this_gen) {
     }
 
     if (this->discard_buffers) {
+      fifo_remove (this->out_fifo);
       if (in_buf->stream)
 	_x_refcounter_dec(in_buf->stream->refcounter);
       fifo_append (this->free_fifo, in_buf);
@@ -1039,6 +1051,7 @@ static void *ao_loop (void *this_gen) {
 	cur_time = this->clock->get_current_time (this->clock);
 	if (in_buf->vpts < cur_time ) {
 	  lprintf ("loop: next fifo\n");
+	  fifo_remove (this->out_fifo);
 	  if (in_buf->stream)
 	    _x_refcounter_dec(in_buf->stream->refcounter);
 	  fifo_append (this->free_fifo, in_buf);
@@ -1163,6 +1176,7 @@ static void *ao_loop (void *this_gen) {
 
       /* drop package */
       lprintf ("loop: drop package, next fifo\n");
+      fifo_remove (this->out_fifo);
       if (in_buf->stream)
 	_x_refcounter_dec(in_buf->stream->refcounter);
       fifo_append (this->free_fifo, in_buf);
@@ -1229,6 +1243,7 @@ static void *ao_loop (void *this_gen) {
       } else {
         result = 0;
       }
+      fifo_remove (this->out_fifo);
       
       if( result < 0 ) {
         /* device unplugged. */