nitpick: reset MAX_AUDIO_CHANNEL and MAX_SPU_CHANNEL together with other stream info in xine_close

CVS patchset: 7411
CVS date: 2005/02/13 22:12:50

3 files changed, 11 insertions, 6 deletions

diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 460672d59..dd216e67c 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_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: video_decoder.c,v 1.155 2004/12/16 13:59:06 mroi Exp $
+ * $Id: video_decoder.c,v 1.156 2005/02/13 22:12:50 holstsn Exp $
  *
  */
 
@@ -236,12 +236,12 @@ static void *video_decoder_loop (void *stream_gen) {
       pthread_mutex_unlock (&stream->counter_lock);
 
       /* Wake up xine_play if it's waiting for a frame */
-      pthread_mutex_lock (&stream->first_frame_lock);
+      /*pthread_mutex_lock (&stream->first_frame_lock);
       if (stream->first_frame_flag) {
         stream->first_frame_flag = 0;
         pthread_cond_broadcast(&stream->first_frame_reached);
       }
-      pthread_mutex_unlock (&stream->first_frame_lock);
+      pthread_mutex_unlock (&stream->first_frame_lock);*/
       break;
 
     case BUF_CONTROL_QUIT:
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 1c489747e..c56fef829 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_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: video_out.c,v 1.214 2004/12/12 22:01:32 mroi Exp $
+ * $Id: video_out.c,v 1.215 2005/02/13 22:12:50 holstsn Exp $
  *
  * frame allocation / queuing / scheduling / output functions
  */
@@ -484,6 +484,7 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) {
       if (stream->first_frame_flag == 2) {
         if (this->grab_only) {
           stream->first_frame_flag = 0;
+          xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "first frame reached 1\n");
           pthread_cond_broadcast(&stream->first_frame_reached);
         } else
           stream->first_frame_flag = 1;
@@ -669,7 +670,7 @@ static vo_frame_t * duplicate_frame( vos_t *this, vo_frame_t *img ) {
   dupl->proc_called = 0;
 
   dupl->duration  = img->duration;
-  dupl->is_first  = img->is_first;
+  dupl->is_first  = 0;
 
   dupl->stream    = NULL;
   memcpy( dupl->extra_info, img->extra_info, sizeof(extra_info_t) );
@@ -944,6 +945,7 @@ static void overlay_and_display_frame (vos_t *this,
       pthread_mutex_lock (&stream->first_frame_lock);
       if (stream->first_frame_flag) {
         stream->first_frame_flag = 0;
+        xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "first frame reached 2\n");
         pthread_cond_broadcast(&stream->first_frame_reached);
       }
       pthread_mutex_unlock (&stream->first_frame_lock);
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 49ee8788e..8e7975727 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.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: xine.c,v 1.309 2005/02/09 20:03:21 tmattern Exp $
+ * $Id: xine.c,v 1.310 2005/02/13 22:12:50 holstsn Exp $
  */
 
 /*
@@ -383,6 +383,9 @@ static void close_internal (xine_stream_t *stream) {
     _x_meta_info_reset(stream, i);
     _x_meta_info_public_reset(stream, i);
   }
+  stream->audio_track_map_entries = 0;
+  stream->spu_track_map_entries = 0;
+
 }
 
 void xine_close (xine_stream_t *stream) {