more fixes

CVS patchset: 177
CVS date: 2001/06/14 10:48:24

4 files changed, 16 insertions, 7 deletions

diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index d6bafa761..ebda3f6d7 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.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: demux_mpeg.c,v 1.16 2001/06/11 03:14:29 heikos Exp $
+ * $Id: demux_mpeg.c,v 1.17 2001/06/14 10:48:24 guenter Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -152,6 +152,10 @@ static void parse_mpeg2_packet (demux_mpeg_t *this, int nID) {
 
     if(this->audio_fifo)
       buf = this->input->read_block (this->input, this->audio_fifo, nLen-4);
+    else {
+      buf = this->input->read (this->input, this->dummy_space, nLen);
+      return;
+    }
     
     if (buf == NULL) {
       this->status = DEMUX_FINISHED;
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 547589604..fe78c43d4 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.17 2001/06/14 09:54:13 guenter Exp $
+ * $Id: audio_decoder.c,v 1.18 2001/06/14 10:48:24 guenter Exp $
  *
  *
  * functions that implement audio decoding
@@ -48,10 +48,12 @@ void *audio_decoder_loop (void *this_gen) {
      * there is no video decoder initialized, like
      *  in .mp3 playback.
      */
+    /*
     if(this->cur_video_decoder_plugin == NULL) {
       if(this->status == XINE_PLAY)
 	this->status_callback (this->status);
     }
+    */
     
     switch (buf->type) {
       
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 5574bf57f..028e3546d 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.21 2001/06/14 09:19:44 guenter Exp $
+ * $Id: video_decoder.c,v 1.22 2001/06/14 10:48:24 guenter Exp $
  *
  */
 
@@ -49,10 +49,12 @@ void *video_decoder_loop (void *this_gen) {
      * there is a video decoder initialized, like
      *  in mpeg1/2 playback.
      */
-    if(this->cur_video_decoder_plugin != NULL) {
+    /*
+      if(this->cur_video_decoder_plugin != NULL) {
       if(this->status == XINE_PLAY)
-	this->status_callback (this->status);
-    }
+      this->status_callback (this->status);
+      }
+    */
     
     switch (buf->type) {
     case BUF_CONTROL_START:
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 2e4f6cea2..298e1ebbc 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.17 2001/06/14 09:19:44 guenter Exp $
+ * $Id: video_out.c,v 1.18 2001/06/14 10:48:24 guenter Exp $
  *
  */
 
@@ -327,6 +327,7 @@ static void vo_close (vo_instance_t *this) {
     void *p;
 
     this->video_loop_running = 0;
+    kill (0, SIGALRM);
     pthread_join (this->video_thread, &p);
   }
 }