minor cleanups and fixes, fixed still image support in metronom

CVS patchset: 881
CVS date: 2001/10/24 22:23:10

2 files changed, 11 insertions, 8 deletions

diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index bd07696e8..6b3effcc6 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.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: metronom.c,v 1.31 2001/10/23 21:58:11 jcdutton Exp $
+ * $Id: metronom.c,v 1.32 2001/10/24 22:23:10 guenter Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -51,6 +51,10 @@
 #define PREBUFFER_PTS_OFFSET 30000
 
 /*
+#define METRONOM_LOG
+*/
+
+/*
  * ****************************************
  *   primary SCR plugin: 
  *    unix System Clock Reference
@@ -537,10 +541,7 @@ static uint32_t metronom_got_video_frame (metronom_t *this, uint32_t pts) {
 }
 
 static void metronom_got_audio_still (metronom_t *this) {
-  /* This code does not seem to work. */
-  /* A simple return works ok for now. */
-  return;
-  
+
   pthread_mutex_lock (&this->lock);
 
   this->audio_vpts            += this->pts_per_frame + this->video_pts_delta;
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 853fa6fc4..314dfded6 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.59 2001/10/21 12:09:06 jcdutton Exp $
+ * $Id: video_decoder.c,v 1.60 2001/10/24 22:23:10 guenter Exp $
  *
  */
 
@@ -76,7 +76,7 @@ void *video_decoder_loop (void *this_gen) {
     if (buf->input_time)
       this->cur_input_time = buf->input_time;
 
-    /* printf ("video_decoder: got buffer %d\n", buf->type);    */
+    /* printf ("video_decoder: got buffer 0x%08x\n", buf->type);      */
 
     switch (buf->type & 0xffff0000) {
     case BUF_CONTROL_START:
@@ -209,8 +209,10 @@ void *video_decoder_loop (void *this_gen) {
 	  
 	  if (this->cur_video_decoder_plugin != decoder) {
 	    
-	    if (this->cur_video_decoder_plugin) 
+	    if (this->cur_video_decoder_plugin) {
 	      this->cur_video_decoder_plugin->close (this->cur_video_decoder_plugin);
+	      printf ("video_decoder: closing old decoder >%s<\n",this->cur_video_decoder_plugin->get_identifier());
+	    }
 	    
 	    this->cur_video_decoder_plugin = decoder;
 	    this->cur_video_decoder_plugin->init (this->cur_video_decoder_plugin, this->video_out);