xprintf clean pass. xprintf now log into new XINE_LOG_TRACE log buffer. scratch buffer enhancement (thanks Thibaut for the malloc tips), enlarge log buffer from 25 lines (very useless), to 150 (better).

CVS patchset: 5801
CVS date: 2003/11/26 23:44:08

8 files changed, 69 insertions, 102 deletions

diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 76a24e4e4..0036fdbe9 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.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_asf.c,v 1.143 2003/11/26 19:43:27 f1rmb Exp $
+ * $Id: demux_asf.c,v 1.144 2003/11/26 23:44:09 f1rmb Exp $
  *
  * demultiplexer for asf streams
  *
@@ -184,8 +184,7 @@ static uint8_t get_byte (demux_asf_t *this) {
   /* printf ("%02x ", buf); */
 
   if (i != 1) {
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: end of data\n");
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: end of data\n");
     this->status = DEMUX_FINISHED;
   }
 
@@ -202,8 +201,7 @@ static uint16_t get_le16 (demux_asf_t *this) {
   /* printf (" [%02x %02x] ", buf[0], buf[1]); */
 
   if (i != 2) {
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: end of data\n");
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: end of data\n");
     this->status = DEMUX_FINISHED;
   }
 
@@ -220,8 +218,7 @@ static uint32_t get_le32 (demux_asf_t *this) {
   /* printf ("%02x %02x %02x %02x ", buf[0], buf[1], buf[2], buf[3]); */
 
   if (i != 4) {
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: end of data\n");
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: end of data\n");
     this->status = DEMUX_FINISHED;
   }
 
@@ -236,8 +233,7 @@ static uint64_t get_le64 (demux_asf_t *this) {
   i = this->input->read (this->input, buf, 8);
 
   if (i != 8) {
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: end of data\n");
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: end of data\n");
     this->status = DEMUX_FINISHED;
   }
 
@@ -254,11 +250,12 @@ static int get_guid_id (demux_asf_t *this, GUID g) {
     }
   }
   
-  if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-    printf ("demux_asf: unknown GUID: 0x%x, 0x%x, 0x%x, "
-	    "{ 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx }\n",
-	    g.Data1, g.Data2, g.Data3,
-	    g.Data4[0], g.Data4[1], g.Data4[2], g.Data4[3], g.Data4[4], g.Data4[5], g.Data4[6], g.Data4[7]);
+  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+	  "demux_asf: unknown GUID: 0x%x, 0x%x, 0x%x, "
+	  "{ 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx }\n",
+	  g.Data1, g.Data2, g.Data3,
+	  g.Data4[0], g.Data4[1], g.Data4[2], g.Data4[3], g.Data4[4], g.Data4[5], g.Data4[6], g.Data4[7]);
+
   return GUID_ERROR;
 }
 
@@ -460,9 +457,9 @@ static int asf_read_header (demux_asf_t *this) {
               this->reorder_w = (buffer[2]<<8)|buffer[1];
               this->reorder_b = (buffer[4]<<8)|buffer[3];
               this->reorder_w /= this->reorder_b;
-	      if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-		printf ("demux_asf: audio conceal interleave detected (%d x %d x %d)\n",
-			this->reorder_w, this->reorder_h, this->reorder_b );
+	      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+		      "demux_asf: audio conceal interleave detected (%d x %d x %d)\n",
+		      this->reorder_w, this->reorder_h, this->reorder_b );
             } else {
               this->reorder_b=this->reorder_h=this->reorder_w=1;
             }
@@ -626,8 +623,7 @@ static int demux_asf_send_headers_common (demux_asf_t *this, int send_ctrl_start
 
   if (!asf_read_header (this)) {
 
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: asf_read_header failed.\n");
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: asf_read_header failed.\n");
 
     this->status = DEMUX_FINISHED;
     return 1;
@@ -655,9 +651,9 @@ static int demux_asf_send_headers_common (demux_asf_t *this, int send_ctrl_start
       stream_id  = this->streams[i].stream_id;
       bitrate    = this->bitrates[stream_id];
 
-      if (this->stream->xine->verbosity >= XINE_VERBOSITY_LOG) 
-        printf("demux_asf: stream: %d, bitrate %d bps\n", stream_id, bitrate);
-
+      xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
+	      "demux_asf: stream: %d, bitrate %d bps\n", stream_id, bitrate);
+      
       if ((buf_type == BUF_VIDEO_BASE) &&
           (bitrate > max_vrate || this->video_stream_id == -1)) {
 
@@ -683,9 +679,8 @@ static int demux_asf_send_headers_common (demux_asf_t *this, int send_ctrl_start
 
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, bitrate);
 
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf("demux_asf: video stream_id: %d, audio stream_id: %d\n",
-             this->video_stream_id, this->audio_stream_id);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: video stream_id: %d, audio stream_id: %d\n",
+	    this->video_stream_id, this->audio_stream_id);
 
     if(_x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_AUDIO))
       asf_send_audio_header(this, this->audio_stream);
@@ -1015,8 +1010,7 @@ static int asf_parse_packet_header(demux_asf_t *this) {
         g.Data4[i] = get_byte(this);
       }
       if (get_guid_id(this, g) == GUID_ASF_HEADER) {
-        if (this->stream->xine->verbosity >= XINE_VERBOSITY_LOG)
-          printf("demux_asf: new asf header detected\n");
+        xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "demux_asf: new asf header detected\n");
         if (demux_asf_send_headers_common(this, 0))
           return 1;
         invalid_packet = 1;
@@ -1099,8 +1093,7 @@ static int asf_parse_packet_header(demux_asf_t *this) {
 
   if (this->packet_padsize > this->packet_size) {
     /* skip packet */
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
-      printf ("demux_asf: invalid padsize: %d\n", this->packet_padsize);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: invalid padsize: %d\n", this->packet_padsize);
     return 1;
   }
   
@@ -1238,8 +1231,7 @@ static int asf_parse_packet_payload_common(demux_asf_t *this,
 
   if (*rlen > this->packet_size_left) {
     /* skip packet */
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: invalid rlen %d\n", *rlen);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: invalid rlen %d\n", *rlen);
     return 1;
   }
 
@@ -1291,8 +1283,7 @@ static int asf_parse_packet_payload_single(demux_asf_t *this,
 
   if (data_length > this->packet_size_left) {
     /* skip packet */
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: invalid data_length\n");
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: invalid data_length\n");
     return 1;
   }
 
@@ -1306,14 +1297,12 @@ static int asf_parse_packet_payload_single(demux_asf_t *this,
     if (stream && stream->fifo) {
       /* keyframe detection for non-seekable input plugins */
       if (stream->skip && (raw_id & 0x80) && !this->keyframe_ts) {
-        if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-          printf ("demux_asf: keyframe detected\n");
+        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: keyframe detected\n");
         this->keyframe_ts = 1;
       }
 
       if (stream->resync && (*timestamp >= this->keyframe_ts) && (this->keyframe_ts)) {
-        if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-          printf ("demux_asf: stream resynced\n");
+        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: stream resynced\n");
         stream->resync = 0;
         stream->skip = 0;
       }
@@ -1365,8 +1354,7 @@ static int asf_parse_packet_payload_multiple(demux_asf_t *this,
     if (rlen - 8) this->input->seek (this->input, rlen - 8, SEEK_CUR);
     s_hdr_size += rlen - 8;
   } else {
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: strange rlen %d\n", rlen);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: strange rlen %d\n", rlen);
     *timestamp   = 0;
     payload_size = 0;
     if (rlen) this->input->seek (this->input, rlen, SEEK_CUR);
@@ -1396,8 +1384,7 @@ static int asf_parse_packet_payload_multiple(demux_asf_t *this,
 
   if (frag_len > this->packet_size_left) {
     /* skip packet */
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: invalid frag_len %d\n", frag_len);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: invalid frag_len %d\n", frag_len);
     return 1;
   }
 
@@ -1411,14 +1398,12 @@ static int asf_parse_packet_payload_multiple(demux_asf_t *this,
     if (!frag_offset) {
       /* keyframe detection for non-seekable input plugins */
       if (stream->skip && (raw_id & 0x80) && !this->keyframe_ts) {
-        if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-          printf ("demux_asf: keyframe detected\n");
+        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: keyframe detected\n");
         this->keyframe_ts = 1;
       }
       if (stream->resync && (*timestamp >= this->keyframe_ts) &&
           this->keyframe_ts && !frag_offset) {
-        if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-          printf ("demux_asf: stream resynced\n");
+        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: stream resynced\n");
         stream->resync = 0;
         stream->skip = 0;
       }
@@ -1511,8 +1496,7 @@ static int demux_asf_parse_http_references( demux_asf_t *this) {
       memcpy(href, "mmsh", 4);
     }
     
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_LOG) 
-      printf("demux_asf: http ref: %s\n", href);
+    xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "demux_asf: http ref: %s\n", href);
     uevent.type = XINE_EVENT_MRL_REFERENCE;
     uevent.stream = this->stream;
     uevent.data_length = strlen(href) + sizeof(xine_mrl_reference_data_t);
@@ -1578,8 +1562,7 @@ static int demux_asf_parse_asf_references( demux_asf_t *this) {
       }
     }
 
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf("demux_asf: asf ref: %s\n", ptr);
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: asf ref: %s\n", ptr);
     uevent.type = XINE_EVENT_MRL_REFERENCE;
     uevent.stream = this->stream;
     uevent.data_length = strlen(ptr) + sizeof(xine_mrl_reference_data_t);
@@ -1741,8 +1724,7 @@ static int demux_asf_send_chunk (demux_plugin_t *this_gen) {
     
     
       if (asf_parse_packet_header(this)) {
-        if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
-          printf ("demux_asf: get_packet failed\n");
+        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: get_packet failed\n");
         this->status = DEMUX_FINISHED;
         return this->status;
       }
@@ -1811,8 +1793,7 @@ static void demux_asf_send_headers (demux_plugin_t *this_gen) {
 
   guid = get_guid(this);
   if (guid != GUID_ASF_HEADER) {
-    if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-      printf ("demux_asf: file doesn't start with an asf header\n");
+    xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: file doesn't start with an asf header\n");
     this->status = DEMUX_FINISHED;
     return;
   }
@@ -1958,8 +1939,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
       start_pos -= this->packet_size;
     }
     if (state != 5) {
-      if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) 
-        printf ("demux_asf: demux_asf_seek: begining of the stream\n");
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_asf: demux_asf_seek: begining of the stream\n");
       this->input->seek (this->input, this->first_packet_pos, SEEK_SET);
     } else {
       this->input->seek (this->input, start_pos + this->packet_size, SEEK_SET);
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index d9faf7011..43d09f906 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_avi.c,v 1.182 2003/11/26 19:43:28 f1rmb Exp $
+ * $Id: demux_avi.c,v 1.183 2003/11/26 23:44:09 f1rmb Exp $
  *
  * demultiplexer for avi streams
  *
@@ -684,8 +684,7 @@ static avi_t *AVI_init(demux_avi_t *this) {
     this->idx_grow.nexttagoffset = this->input->get_current_pos(this->input);
 
     if (this->input->read(this->input, data,8) != 8 ) {
-      xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-	      "failed to read 8 bytes at pos %lld\n",
+      xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "failed to read 8 bytes at pos %lld\n",
               this->idx_grow.nexttagoffset);
       break; /* We assume it's EOF */
     }
@@ -695,8 +694,7 @@ static avi_t *AVI_init(demux_avi_t *this) {
     next_chunk = this->idx_grow.nexttagoffset + 8 + n;
     
     if (n == 0) {
-      xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-	      "invalid chunk length (0 byte)\n");
+      xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "invalid chunk length (0 byte)\n");
       break;
     }
     
@@ -1504,7 +1502,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
 
   if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) {
     for (i=0; i < this->avi->n_audio; i++)
-      printf ("demux_avi: audio format[%d] = 0x%x\n",
+      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_avi: audio format[%d] = 0x%x\n",
 	      i, this->avi->audio[i]->wavex->wFormatTag);
   }
   this->no_audio = 0;
@@ -1513,14 +1511,12 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
     this->avi->audio[i]->audio_type = _x_formattag_to_buf_audio (this->avi->audio[i]->wavex->wFormatTag);
 
     if( !this->avi->audio[i]->audio_type ) {
-      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-               "unknown audio type 0x%x\n",
+      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "unknown audio type 0x%x\n",
 	       this->avi->audio[i]->wavex->wFormatTag);
       this->no_audio  = 1;
       this->avi->audio[i]->audio_type     = BUF_AUDIO_UNKNOWN;
     } else
-      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-               "demux_avi: audio type %s (wFormatTag 0x%x)\n",
+      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_avi: audio type %s (wFormatTag 0x%x)\n",
                _x_buf_audio_name(this->avi->audio[i]->audio_type),
                (int)this->avi->audio[i]->wavex->wFormatTag);
   }
@@ -1554,15 +1550,13 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
                          this->avi->compressor);
 
     if (!this->avi->video_type) {
-      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-               "demux_avi: unknown video codec '%.4s'\n",
+      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_avi: unknown video codec '%.4s'\n",
                (char*)&this->avi->bih->biCompression);
       this->avi->video_type = BUF_VIDEO_UNKNOWN;
     }
     buf->type = this->avi->video_type;
 
-    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-             "demux_avi: video codec is '%s'\n",
+    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_avi: video codec is '%s'\n",
              _x_buf_video_name(buf->type));
 
     this->video_fifo->put (this->video_fifo, buf);
@@ -1657,7 +1651,7 @@ static int demux_avi_seek_internal (demux_avi_t *this) {
    */
 
   xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-           "start pos is %lld, start time is %d\n",start_pos, start_time);
+	   "start pos is %lld, start time is %d\n",start_pos, start_time);
 
   /* Seek video.  We do a single idx_grow at the beginning rather than
    * incrementally growing the index in a loop, so that if the index
@@ -1723,8 +1717,7 @@ static int demux_avi_seek_internal (demux_avi_t *this) {
    * position we've already found, so we won't be seeking though the
    * file much at this point. */
 
-  if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
-    lprintf ("video_pts = %lld\n", video_pts);
+  xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "video_pts = %lld\n", video_pts);
 
   /* FIXME ? */
   audio_pts = 77777777;
diff --git a/src/demuxers/demux_nsf.c b/src/demuxers/demux_nsf.c
index 36a56334c..eb89c1b01 100644
--- a/src/demuxers/demux_nsf.c
+++ b/src/demuxers/demux_nsf.c
@@ -30,7 +30,7 @@
  * For more information regarding the NSF format, visit:
  *   http://www.tripoint.org/kevtris/nes/nsfspec.txt
  *
- * $Id: demux_nsf.c,v 1.19 2003/11/16 23:33:43 f1rmb Exp $
+ * $Id: demux_nsf.c,v 1.20 2003/11/26 23:44:09 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -298,8 +298,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   demux_nsf_t   *this;
 
   if (!INPUT_IS_SEEKABLE(input)) {
-    xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
-            _("input not seekable, can not handle!\n"));
+    xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "input not seekable, can not handle!\n");
     return NULL;
   }
 
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 68b4bfd86..ea5d5f7ba 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_ogg.c,v 1.117 2003/11/26 19:43:30 f1rmb Exp $
+ * $Id: demux_ogg.c,v 1.118 2003/11/26 23:44:09 f1rmb Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -727,8 +727,7 @@ static void demux_ogg_send_header (demux_ogg_t *this) {
     } else {
       stream_num = get_stream(this, cur_serno);
       if (stream_num == -1) {
-	xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-                 "help, stream with no beginning!\n");
+	xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "help, stream with no beginning!\n");
 	abort();
       }
     }
@@ -818,8 +817,7 @@ static void demux_ogg_send_header (demux_ogg_t *this) {
 	    this->preview_buffers[stream_num] += header->extra_headers;
 	  }
 #else
-	  xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-                   "Speex stream detected, unable to play\n");
+	  xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "Speex stream detected, unable to play\n");
 
 	  this->buf_types[stream_num] = BUF_CONTROL_NOP;
 #endif
@@ -951,8 +949,8 @@ static void demux_ogg_send_header (demux_ogg_t *this) {
 	      this->buf_types[stream_num] = BUF_AUDIO_A52 | channel;
 	      break;
 	    default:
-              xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-                       "demux_ogg: unknown audio codec type 0x%x\n", codec);
+              xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+		       "demux_ogg: unknown audio codec type 0x%x\n", codec);
 	      this->buf_types[stream_num] = BUF_CONTROL_NOP;
 	      break;
 	    }
@@ -1099,9 +1097,8 @@ static void demux_ogg_send_header (demux_ogg_t *this) {
 
 #endif
 
-	    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-                     "FIXME, old audio format not handled\n");
-
+	    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "FIXME, old audio format not handled\n");
+	    
 	    this->buf_types[stream_num] = BUF_CONTROL_NOP;
 
 	  } else {
@@ -1168,7 +1165,7 @@ static void demux_ogg_send_header (demux_ogg_t *this) {
 	  } else {
 	    /*Rejected stream*/
 	    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-                     " A theora header was rejected by libtheora\n");
+                     "A theora header was rejected by libtheora\n");
 	    this->buf_types[stream_num] = BUF_CONTROL_NOP;
 	    this->preview_buffers[stream_num] = 5; /* FIXME: don't know */
 	  }
@@ -1178,10 +1175,12 @@ static void demux_ogg_send_header (demux_ogg_t *this) {
 #endif
 
 	} else {
-          if(this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG){
-            printf ("demux_ogg: unknown stream type (signature >%.8s<). hex dump of bos packet follows:\n", op.packet);
+          xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
+		  "demux_ogg: unknown stream type (signature >%.8s<). hex dump of bos packet follows:\n",
+		  op.packet);
+	  if(this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
             xine_hexdump (op.packet, op.bytes);
-          }
+
 	  this->buf_types[stream_num] = BUF_CONTROL_NOP;
 	}
       }
@@ -1318,7 +1317,7 @@ static void demux_ogg_send_content (demux_ogg_t *this) {
 	  iframe=op.granulepos>>keyframe_granule_shift;
 	  pframe=op.granulepos-(iframe<<keyframe_granule_shift);
           xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
-                   "seeking keyframe i %lld p %lld\n",iframe,pframe);
+                   "seeking keyframe i %lld p %lld\n", iframe, pframe);
 	  if (pframe!=0)
 	    continue;
 	} else
diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
index a6040ca6d..fcd87e403 100644
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -23,7 +23,7 @@
  * For more information regarding the PVA file format, refer to this PDF:
  *   http://www.technotrend.de/download/av_format_v1.pdf
  *
- * $Id: demux_pva.c,v 1.15 2003/11/16 23:33:43 f1rmb Exp $
+ * $Id: demux_pva.c,v 1.16 2003/11/26 23:44:09 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -419,8 +419,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   demux_pva_t    *this;
 
   if (!INPUT_IS_SEEKABLE(input)) {
-    xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
-            _("input not seekable, can not handle!\n"));
+    xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "input not seekable, can not handle!\n");
     return NULL;
   }
 
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 299f9ddc7..13672c88d 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -23,7 +23,7 @@
  * For more information regarding the RoQ file format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  *
- * $Id: demux_roq.c,v 1.48 2003/11/26 19:43:30 f1rmb Exp $
+ * $Id: demux_roq.c,v 1.49 2003/11/26 23:44:09 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -404,8 +404,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   demux_roq_t    *this;
 
   if (!INPUT_IS_SEEKABLE(input)) {
-    xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
-            _("input not seekable, can not handle!\n"));
+    xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "input not seekable, can not handle!\n");
     return NULL;
   }
 
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index fea38c122..3734e18d0 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -23,7 +23,7 @@
  * For more information on the SMJPEG file format, visit:
  *   http://www.lokigames.com/development/smjpeg.php3
  *
- * $Id: demux_smjpeg.c,v 1.46 2003/11/16 23:33:43 f1rmb Exp $
+ * $Id: demux_smjpeg.c,v 1.47 2003/11/26 23:44:09 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -398,8 +398,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   demux_smjpeg_t *this;
 
   if (!INPUT_IS_SEEKABLE(input)) {
-    xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
-            _("input not seekable, can not handle!\n"));
+    xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "input not seekable, can not handle!\n");
     return NULL;
   }
 
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index 3d69d6cd6..b4f291906 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -24,7 +24,7 @@
  * This demuxer handles either raw STR files (which are just a concatenation
  * of raw compact disc sectors) or STR files with RIFF headers.
  *
- * $Id: demux_str.c,v 1.21 2003/11/26 19:43:31 f1rmb Exp $
+ * $Id: demux_str.c,v 1.22 2003/11/26 23:44:09 f1rmb Exp $
  */
 
 /*
@@ -549,8 +549,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   demux_str_t    *this;
 
   if (!INPUT_IS_SEEKABLE(input)) {
-    xprintf(stream->xine, XINE_VERBOSITY_DEBUG,
-      _("input not seekable, can not handle!\n"));
+    xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "input not seekable, can not handle!\n");
     return NULL;
   }