[xine-cvs] CVS: xine-lib/src/demuxers demux_ogg.c,1.37,1.38

[Guenter B. <gu...@us...>]

Update of /cvsroot/xine/xine-lib/src/demuxers
In directory usw-pr-cvs1:/tmp/cvs-serv27301

Modified Files:
	demux_ogg.c 
Log Message:
send start buffers before headers(preview buffers)

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_ogg.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- demux_ogg.c	28 Aug 2002 20:56:42 -0000	1.37
+++ demux_ogg.c	28 Aug 2002 22:16:53 -0000	1.38
@@ -817,11 +817,23 @@
   this->status = DEMUX_FINISHED;
 
   if (this->send_end_buffers) {
+#ifdef LOG
+    printf ("demux_ogg: sending end buffers\n");
+#endif
     xine_demux_control_end(this->xine, BUF_FLAG_END_STREAM);
+  } else {
+#ifdef LOG
+    printf ("demux_ogg: not sending end buffers\n");
+#endif
   }
 
   this->thread_running = 0;
   pthread_mutex_unlock( &this->mutex );
+
+#ifdef LOG
+  printf ("demux_ogg: thread ends\n");
+#endif
+
   pthread_exit(NULL);
 
   return NULL;
@@ -877,6 +889,12 @@
   pthread_mutex_lock( &this->mutex );
   err = 1;
 
+  this->status = DEMUX_OK;
+
+  /*
+   * send start buffers
+   */
+
   if( !this->thread_running ) {
     this->video_fifo  = video_fifo;
     this->audio_fifo  = audio_fifo;
@@ -895,7 +913,15 @@
     this->avg_bitrate       = 1;
 
     this->input->seek (this->input, 0, SEEK_SET);
+  }
 
+  if( !this->thread_running && (this->status == DEMUX_OK) ) {
+    xine_demux_control_start(this->xine);
+  } else {
+    xine_demux_flush_engine(this->xine);
+  }
+
+  if (this->status == DEMUX_OK) {
     /* send header */
     demux_ogg_send_header (this);
   }
@@ -918,15 +944,6 @@
     this->input->seek (this->input, start_pos, SEEK_SET);
   }
 
-  /*
-   * send start buffers
-   */
-  if( !this->thread_running && (this->status == DEMUX_OK) ) {
-    xine_demux_control_start(this->xine);
-  } else {
-    xine_demux_flush_engine(this->xine);
-  }
-
   this->send_newpts     = 1;
 
   if( !this->thread_running ) {
@@ -938,6 +955,11 @@
     this->send_end_buffers  = 1;
     this->thread_running    = 1;
     this->buf_flag_seek     = 0;
+
+#ifdef LOG
+    printf ("demux_ogg: creating thread (send_end_buffers=%d)\n",
+	    this->send_end_buffers);
+#endif
 
     if ((err = pthread_create (&this->thread,
 			       NULL, demux_ogg_loop, this)) != 0) {