From ecfc1165ca6cba9bb914bb6a0b88979a7720c266 Mon Sep 17 00:00:00 2001
From: Guenter Bartsch <guenter@users.sourceforge.net>
Date: Sun, 24 Jun 2001 03:36:30 +0000
Subject: fixed small audio_fd initialization bug

CVS patchset: 223
CVS date: 2001/06/24 03:36:30
---
 src/audio_out/audio_oss_out.c   | 6 ++++--
 src/xine-engine/audio_decoder.c | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 0230741e6..4d214923f 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_oss_out.c,v 1.16 2001/06/24 02:19:29 guenter Exp $
+ * $Id: audio_oss_out.c,v 1.17 2001/06/24 03:36:30 guenter Exp $
  */
 
 /* required for swab() */
@@ -127,8 +127,9 @@ static int ao_open(ao_functions_t *this_gen,
 
   if (this->audio_fd > -1) {
 
-    if ( (mode == this->mode) && (rate == this->input_sample_rate) )
+    if ( (mode == this->mode) && (rate == this->input_sample_rate) ) {
       return 1;
+    }
 
     close (this->audio_fd);
   }
@@ -601,6 +602,7 @@ ao_functions_t *init_audio_out_plugin (config_values_t *config) {
   close (audio_fd);
 
   this->output_sample_rate = 0;
+  this->audio_fd = -1;
 
   this->zero_space = malloc (8192);
   memset (this->zero_space, 0, 8192);
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 249f70777..557388426 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_decoder.c,v 1.22 2001/06/23 19:45:47 guenter Exp $
+ * $Id: audio_decoder.c,v 1.23 2001/06/24 03:36:30 guenter Exp $
  *
  *
  * functions that implement audio decoding
@@ -39,8 +39,12 @@ void *audio_decoder_loop (void *this_gen) {
 
   while (running) {
 
+    /* printf ("audio_loop: waiting for package...\n"); */
+
     buf = this->audio_fifo->get (this->audio_fifo);
 
+    /* printf ("audio_loop: got package pts = %d\n", buf->PTS); */
+
     if (buf->input_pos)
       this->cur_input_pos = buf->input_pos;
     
-- 
cgit v1.2.3