Misc warnings fixes.

CVS patchset: 8055
CVS date: 2006/06/18 20:29:03

16 files changed, 57 insertions, 53 deletions

diff --git a/src/audio_out/audio_arts_out.c b/src/audio_out/audio_arts_out.c
index 4eba7d081..4196def9e 100644
--- a/src/audio_out/audio_arts_out.c
+++ b/src/audio_out/audio_arts_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: audio_arts_out.c,v 1.29 2006/05/03 19:46:06 dsalt Exp $
+ * $Id: audio_arts_out.c,v 1.30 2006/06/18 20:29:03 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -91,7 +91,7 @@ static void ao_arts_volume(void *buffer, int length, int volume) {
     v=(int) ((*(data) * volume) / 100);
     *(data)=(v>32767) ? 32767 : ((v<-32768) ? -32768 : v);
     *(data)=LE_16(data);
-    *(data++);
+    data++;
   }
 }
 /* End volume control */
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
index c4b51d325..7cc37cdcb 100644
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_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: audio_file_out.c,v 1.5 2006/06/02 22:18:56 dsalt Exp $
+ * $Id: audio_file_out.c,v 1.6 2006/06/18 20:29:03 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -203,7 +203,7 @@ static int ao_file_write(ao_driver_t *this_gen, int16_t *data,
 	}
 #endif
 	while(len) {
-		size_t thislen = write(this->fd, data, len);
+		ssize_t thislen = write(this->fd, data, len);
 
 		if (thislen == -1) {
 			xprintf (this->xine, XINE_VERBOSITY_LOG, "audio_file_out: Failed to write data to file '%s': %s\n",
@@ -259,7 +259,7 @@ static void ao_file_close(ao_driver_t *this_gen)
 	uint32_t len;
 
 	len = le2me_32(this->bytes_written);
-	xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_file_out: Close file '%s'. %d KiB written\n",
+	xprintf (this->xine, XINE_VERBOSITY_DEBUG, "audio_file_out: Close file '%s'. %zu KiB written\n",
 		 this->fname, this->bytes_written / 1024);
 
 	if (lseek(this->fd, 40, SEEK_SET) != -1) {
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 00a51c6f6..0d3302aa8 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
  *    build_frame_table
  *  free_qt_info
  *
- * $Id: demux_qt.c,v 1.207 2006/06/02 22:18:56 dsalt Exp $
+ * $Id: demux_qt.c,v 1.208 2006/06/18 20:29:03 dgp85 Exp $
  *
  */
 
@@ -1397,7 +1397,7 @@ static qt_error parse_trak_atom (qt_trak *trak,
       for (j = 0; j < trak->chunk_offset_count; j++) {
         trak->chunk_offset_table[j] =
           BE_32(&trak_atom[i + 12 + j * 4]);
-        debug_atom_load("      chunk %d @ 0x%llX\n",
+        debug_atom_load("      chunk %d @ 0x%"PRIX64"\n",
           j, trak->chunk_offset_table[j]);
       }
 
@@ -1428,7 +1428,7 @@ static qt_error parse_trak_atom (qt_trak *trak,
         trak->chunk_offset_table[j] <<= 32;
         trak->chunk_offset_table[j] |=
           BE_32(&trak_atom[i + 12 + j * 8 + 4]);
-        debug_atom_load("      chunk %d @ 0x%llX\n",
+        debug_atom_load("      chunk %d @ 0x%"PRIX64"\n",
           j, trak->chunk_offset_table[j]);
       }
 
@@ -1579,7 +1579,7 @@ static qt_error parse_reference_atom (reference_t *ref,
       ref->data_rate = BE_32(&ref_atom[i + 8]);
       ref->data_rate *= 10;
 
-      debug_atom_load("    qt rmdr data rate = %lld\n", ref->data_rate);
+      debug_atom_load("    qt rmdr data rate = %"PRId64"\n", ref->data_rate);
 
     } else if (current_atom == RMVC_ATOM) {
 
@@ -1615,7 +1615,7 @@ static void get_next_edit_list_entry(qt_trak *trak,
 
     *edit_list_media_time = 0;
     *edit_list_duration = MAX_DURATION;
-    debug_edit_list("  qt: no edit list table, initial = %d, %lld\n", *edit_list_media_time, *edit_list_duration);
+    debug_edit_list("  qt: no edit list table, initial = %d, %"PRId64"\n", *edit_list_media_time, *edit_list_duration);
     return;
 
   } else while (*edit_list_index < trak->edit_list_count) {
@@ -1644,7 +1644,7 @@ static void get_next_edit_list_entry(qt_trak *trak,
    */
   if (*edit_list_index == trak->edit_list_count)
     *edit_list_duration = MAX_DURATION;
-  debug_edit_list("  qt: edit list table exists, initial = %d, %lld\n", *edit_list_media_time, *edit_list_duration);
+  debug_edit_list("  qt: edit list table exists, initial = %d, %"PRId64"\n", *edit_list_media_time, *edit_list_duration);
 }
 
 static qt_error build_frame_table(qt_trak *trak,
@@ -1785,7 +1785,7 @@ static qt_error build_frame_table(qt_trak *trak,
     edit_list_pts_counter = 0;
     for (i = 0; i < trak->frame_count; i++) {
 
-      debug_edit_list("    %d: (before) pts = %lld...", i, trak->frames[i].pts);
+      debug_edit_list("    %d: (before) pts = %"PRId64"...", i, trak->frames[i].pts);
 
       if (trak->frames[i].pts < edit_list_media_time) 
         trak->frames[i].pts = edit_list_pts_counter;
@@ -1794,13 +1794,13 @@ static qt_error build_frame_table(qt_trak *trak,
           frame_duration = 
             (trak->frames[i + 1].pts - trak->frames[i].pts);
 
-        debug_edit_list("duration = %lld...", frame_duration);
+        debug_edit_list("duration = %"PRId64"...", frame_duration);
         trak->frames[i].pts = edit_list_pts_counter;
         edit_list_pts_counter += frame_duration;
         edit_list_duration -= frame_duration;
       }
 
-      debug_edit_list("(fixup) pts = %lld...", trak->frames[i].pts);
+      debug_edit_list("(fixup) pts = %"PRId64"...", trak->frames[i].pts);
 
       /* reload media time and duration */
       if (edit_list_duration <= 0) {
@@ -1808,14 +1808,14 @@ static qt_error build_frame_table(qt_trak *trak,
           &edit_list_media_time, &edit_list_duration, global_timescale);
       }
 
-      debug_edit_list("(after) pts = %lld...\n", trak->frames[i].pts);
+      debug_edit_list("(after) pts = %"PRId64"...\n", trak->frames[i].pts);
     }
 
     /* compute final pts values */
     for (i = 0; i < trak->frame_count; i++) {
       trak->frames[i].pts *= 90000;
       trak->frames[i].pts /= trak->timescale;
-      debug_edit_list("  final pts for sample %d = %lld\n", i, trak->frames[i].pts);
+      debug_edit_list("  final pts for sample %d = %"PRId64"\n", i, trak->frames[i].pts);
     }
 
     /* decide which video properties atom to use */
@@ -2015,7 +2015,7 @@ static void parse_moov_atom(qt_info *info, unsigned char *moov_atom,
 
     /* dump the frame table in debug mode */
     for (j = 0; j < info->traks[i].frame_count; j++)
-      debug_frame_table("      %d: %8X bytes @ %llX, %lld pts, media id %d%s\n",
+      debug_frame_table("      %d: %8X bytes @ %"PRIX64", %"PRId64" pts, media id %d%s\n",
         j,
         info->traks[i].frames[j].size,
         info->traks[i].frames[j].offset,
@@ -2056,7 +2056,7 @@ static void parse_moov_atom(qt_info *info, unsigned char *moov_atom,
         info->chosen_reference = i;
     }
 
-    debug_atom_load("  qt: chosen reference is ref #%d, qtim version %04X, %lld bps\n      URL: %s\n",
+    debug_atom_load("  qt: chosen reference is ref #%d, qtim version %04X, %"PRId64" bps\n      URL: %s\n",
       info->chosen_reference,
       info->references[info->chosen_reference].qtim_version,
       info->references[info->chosen_reference].data_rate,
@@ -2376,7 +2376,7 @@ static int demux_qt_send_chunk(demux_plugin_t *this_gen) {
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION,
                          frame_duration);
 
-    debug_video_demux("  qt: sending off video frame %d from offset 0x%llX, %d bytes, media id %d, %lld pts\n",
+    debug_video_demux("  qt: sending off video frame %d from offset 0x%"PRIX64", %d bytes, media id %d, %"PRId64" pts\n",
       i, 
       video_trak->frames[i].offset,
       video_trak->frames[i].size,
@@ -2434,7 +2434,7 @@ static int demux_qt_send_chunk(demux_plugin_t *this_gen) {
     this->input->seek(this->input, audio_trak->frames[i].offset,
       SEEK_SET);
 
-    debug_audio_demux("  qt: sending off audio frame %d from offset 0x%llX, %d bytes, media id %d, %lld pts\n",
+    debug_audio_demux("  qt: sending off audio frame %d from offset 0x%"PRIX64", %d bytes, media id %d, %"PRId64" pts\n",
       i, 
       audio_trak->frames[i].offset,
       audio_trak->frames[i].size,
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index 29b5c9463..c29bf6789 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.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: dxr3_decode_spu.c,v 1.54 2006/06/02 22:18:57 dsalt Exp $
+ * $Id: dxr3_decode_spu.c,v 1.55 2006/06/18 20:29:04 dgp85 Exp $
  */
  
 /* dxr3 spu decoder plugin.
@@ -545,7 +545,7 @@ static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf)
   }
   if (written != buf->size)
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
-	    "dxr3_decode_spu: Could only write %d of %d spu bytes.\n", written, buf->size);
+	    "dxr3_decode_spu: Could only write %zd of %d spu bytes.\n", written, buf->size);
   
   pthread_mutex_unlock(&this->dxr3_vo->spu_device_lock);
 }
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index 58583d1d8..c2237dff5 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.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: dxr3_decode_video.c,v 1.62 2006/06/02 22:18:57 dsalt Exp $
+ * $Id: dxr3_decode_video.c,v 1.63 2006/06/18 20:29:04 dgp85 Exp $
  */
  
 /* dxr3 video decoder plugin.
@@ -622,7 +622,7 @@ static void dxr3_decode_data(video_decoder_t *this_gen, buf_element_t *buf)
   }
   if (written != buf->size)
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
-	    "dxr3_decode_video: Could only write %d of %d video bytes.\n", written, buf->size);
+	    "dxr3_decode_video: Could only write %zd of %d video bytes.\n", written, buf->size);
 }
 
 static void dxr3_reset(video_decoder_t *this_gen)
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 47d2493a7..b81d8ac01 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.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_dxr3.c,v 1.115 2006/06/17 15:20:56 dgp85 Exp $
+ * $Id: video_out_dxr3.c,v 1.116 2006/06/18 20:29:04 dgp85 Exp $
  */
  
 /* mpeg1 encoding video out plugin for the dxr3.  
@@ -897,7 +897,7 @@ static void dxr3_overlay_end(vo_driver_t *this_gen, vo_frame_t *frame_gen)
 	    "video_out_dxr3: spu device write failed (%s)\n", strerror(errno));
   else if (written != this->spu_enc->size)
     xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, 
-	    "video_out_dxr3: Could only write %d of %d spu bytes.\n", written, this->spu_enc->size);
+	    "video_out_dxr3: Could only write %zd of %d spu bytes.\n", written, this->spu_enc->size);
   /* set clipping */
   btn.color = 0x7654;
   btn.contrast =
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 32789950b..56c8e6cd4 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -879,7 +879,7 @@ static channel_t *load_channels(dvb_input_plugin_t *this, int *num_ch, fe_type_t
   f = fopen(filename, "rb");
   if (!f) {
     xprintf(xine, XINE_VERBOSITY_LOG, _("input_dvb: failed to open dvb channel file '%s'\n"), filename);
-    _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, filename, "Please run the dvbscan utility.");
+    _x_message(this->stream, XINE_MSG_FILE_NOT_FOUND, filename, "Please run the dvbscan utility.", NULL);
     return NULL;
   }
 
@@ -1268,7 +1268,7 @@ static void dvb_parse_si(dvb_input_plugin_t *this) {
 /* Helper function for finding the channel index in the channels struct
    given the service_id. If channel is not found, -1 is returned. */
 static int channel_index(dvb_input_plugin_t* this, unsigned int service_id) {
-  int n;
+  unsigned int n;
   for (n=0; n < this->num_channels; n++)
     if (this->channels[n].service_id == service_id) 
 	return n;
diff --git a/src/input/input_smb.c b/src/input/input_smb.c
index b1c98c5aa..d1c1e46bf 100644
--- a/src/input/input_smb.c
+++ b/src/input/input_smb.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: input_smb.c,v 1.12 2006/06/02 22:18:57 dsalt Exp $
+ * $Id: input_smb.c,v 1.13 2006/06/18 20:29:04 dgp85 Exp $
  */
 
 
@@ -239,7 +239,7 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen,
   
 	smb_input_class_t   *this = (smb_input_class_t *) this_gen;
 	int                 (*func) ()        = _sortfiles_default;
-	unsigned int        dir;
+	int        dir;
 	int i;
 	struct smbc_dirent  *pdirent;
 	char current_path [XINE_PATH_MAX + 1];
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index cc18772f8..6ca50ac87 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -803,7 +803,8 @@ static int open_video_capture_device(v4l_input_plugin_t *this)
 {
   int          found       = 0;
   int          tuner_found = 0;
-  int          i, j, ret;
+  int          i, ret;
+  unsigned int j;
   cfg_entry_t *entry;
   
   lprintf("open_video_capture_device\n");
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 4612d7425..22a9f5e17 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1,5 +1,5 @@
 /*
-  $Id: xineplug_inp_vcd.c,v 1.47 2006/04/21 22:34:19 dsalt Exp $
+  $Id: xineplug_inp_vcd.c,v 1.48 2006/06/18 20:29:04 dgp85 Exp $
  
   Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
   
@@ -261,7 +261,7 @@ vcd_add_mrl_slot(vcd_input_class_t *this, const char *mrl, off_t size,
   
   this->mrls[*i] = malloc(sizeof(xine_mrl_t));
   if (NULL==this->mrls[*i]) {
-    LOG_ERR("Can't malloc %d bytes for MRL slot %d (%s)", 
+    LOG_ERR("Can't malloc %zu bytes for MRL slot %u (%s)", 
             sizeof(xine_mrl_t), *i, mrl);
     return;
   }
@@ -272,7 +272,7 @@ vcd_add_mrl_slot(vcd_input_class_t *this, const char *mrl, off_t size,
   
   this->mrls[*i]->mrl = (char *) malloc(strlen(mrl) + 1);
   if (NULL==this->mrls[*i]->mrl) {
-    LOG_ERR("Can't malloc %d bytes for MRL name %s", sizeof(xine_mrl_t), mrl);
+    LOG_ERR("Can't malloc %zu bytes for MRL name %s", sizeof(xine_mrl_t), mrl);
   } else {
     sprintf(this->mrls[*i]->mrl, "%s", mrl);
   }
diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c
index 53e1415ee..a1a760100 100644
--- a/src/libffmpeg/audio_decoder.c
+++ b/src/libffmpeg/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.24 2006/04/21 23:22:04 dsalt Exp $
+ * $Id: audio_decoder.c,v 1.25 2006/06/18 20:29:04 dgp85 Exp $
  *
  * xine audio decoder plugin using ffmpeg
  *
@@ -134,7 +134,8 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
     this->size += buf->size;
     
     if (buf->decoder_flags & BUF_FLAG_FRAME_END) {
-      int i, codec_type;
+      size_t i;
+      unsigned int codec_type;
       xine_waveformatex *audio_header;
   
       codec_type = buf->type & 0xFFFF0000;
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index 656af6fd3..40d51ce6e 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/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 2005/11/04 22:37:14 tmattern Exp $
+ * $Id: video_decoder.c,v 1.60 2006/06/18 20:29:04 dgp85 Exp $
  *
  * xine video decoder plugin using ffmpeg
  *
@@ -274,8 +274,8 @@ static const ff_codec_t ff_video_lookup[] = {
   {BUF_VIDEO_MPEG,        CODEC_ID_MPEG1VIDEO, "MPEG 1/2 (ffmpeg)"} };
 
 
-static void init_video_codec (ff_video_decoder_t *this, int codec_type) {
-  int i;
+static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) {
+  size_t i;
 
   /* find the decoder */
   this->codec = NULL;
@@ -858,8 +858,6 @@ static void ff_handle_header_buffer (ff_video_decoder_t *this, buf_element_t *bu
 }
 
 static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
-  int i;
-
   /* take care of all the various types of special buffers 
   * note that order is important here */
   lprintf("special buffer\n");
@@ -885,6 +883,7 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
       buf->decoder_info[2]);
       
   } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
+    unsigned int i;
 
     palette_entry_t *demuxer_palette;
     AVPaletteControl *decoder_palette;
@@ -903,6 +902,7 @@ static void ff_handle_special_buffer (ff_video_decoder_t *this, buf_element_t *b
     decoder_palette->palette_changed = 1;
 
   } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
+    int i;
   
     lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n");
     this->context->slice_count = buf->decoder_info[2]+1;
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c
index f2442f00d..5f2efb692 100644
--- a/src/libffmpeg/xine_encoder.c
+++ b/src/libffmpeg/xine_encoder.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_encoder.c,v 1.22 2006/04/05 22:12:19 valtri Exp $
+ * $Id: xine_encoder.c,v 1.23 2006/06/18 20:29:04 dgp85 Exp $
  */
  
 /* mpeg encoders for the dxr3 video out plugin. */
@@ -261,7 +261,7 @@ static int lavc_on_display_frame(dxr3_driver_t *drv, dxr3_frame_t *frame)
     }
   if (written != size)
       xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
-        "dxr3_mpeg_encoder: Could only write %d of %d mpeg bytes.\n", written, size);
+        "dxr3_mpeg_encoder: Could only write %zd of %d mpeg bytes.\n", written, size);
   return 1;
 }
 
diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c
index c5b1fab48..4ca792d99 100644
--- a/src/liblpcm/xine_decoder.c
+++ b/src/liblpcm/xine_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: xine_decoder.c,v 1.59 2006/06/02 22:18:57 dsalt Exp $
+ * $Id: xine_decoder.c,v 1.60 2006/06/18 20:29:04 dgp85 Exp $
  * 
  * 31-8-2001 Added LPCM rate sensing.
  *   (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -88,9 +88,9 @@ static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
   /* get config byte from mpeg2 stream */
   if ( (buf->decoder_flags & BUF_FLAG_SPECIAL) &&
         buf->decoder_info[1] == BUF_SPECIAL_LPCM_CONFIG ) {
-    int bits_per_sample = 16;
-    int sample_rate = 0;
-    int num_channels;
+    unsigned int bits_per_sample = 16;
+    unsigned int sample_rate = 0;
+    unsigned int num_channels;
       
     num_channels = (buf->decoder_info[2] & 0x7) + 1;
     switch ((buf->decoder_info[2]>>4) & 3) {
diff --git a/src/libmusepack/xine_decoder.c b/src/libmusepack/xine_decoder.c
index f7cf37b0e..e6b80a1e6 100644
--- a/src/libmusepack/xine_decoder.c
+++ b/src/libmusepack/xine_decoder.c
@@ -23,7 +23,7 @@
  *   32bit float output
  *   Seeking??
  *
- * $Id: xine_decoder.c,v 1.7 2006/06/02 22:18:57 dsalt Exp $
+ * $Id: xine_decoder.c,v 1.8 2006/06/18 20:29:04 dgp85 Exp $
  */
 
 #include <stdio.h>
@@ -87,7 +87,7 @@ typedef struct mpc_decoder_s {
  *************************************************************************/
     
 /* Reads size bytes of data into buffer at ptr. */
-static int32_t mpc_reader_read(void *data, void *ptr, int32_t size) {
+static int32_t mpc_reader_read(void *data, void *ptr, int size) {
   mpc_decoder_t *this = (mpc_decoder_t *) data;
   
   lprintf("mpc_reader_read: size=%d\n", size);
diff --git a/src/libspucmml/xine_decoder.c b/src/libspucmml/xine_decoder.c
index 075a60181..4ff5bc52d 100644
--- a/src/libspucmml/xine_decoder.c
+++ b/src/libspucmml/xine_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: xine_decoder.c,v 1.6 2006/06/02 22:18:58 dsalt Exp $
+ * $Id: xine_decoder.c,v 1.7 2006/06/18 20:29:04 dgp85 Exp $
  *
  */
 
@@ -140,7 +140,8 @@ static void update_font_size (spucmml_decoder_t *this) {
 }
 
 static int get_width(spucmml_decoder_t *this, char* text) {
-  int i=0,width=0,w,dummy;
+  size_t i=0;
+  int width=0,w,dummy;
   char letter[2]={0, 0};
 
   while (i<=strlen(text)) {
@@ -187,7 +188,8 @@ static int get_width(spucmml_decoder_t *this, char* text) {
 }
 
 static void render_line(spucmml_decoder_t *this, int x, int y, char* text) {
-  int i=0,w,dummy;
+  size_t i=0;
+  int w,dummy;
   char letter[2]={0,0};
 
   while (i<=strlen(text)) {
@@ -235,7 +237,7 @@ static void draw_subtitle(spucmml_decoder_t *this, int64_t sub_start) {
   this->stream->osd_renderer->show (this->osd, sub_start);
   
   llprintf (LOG_SCHEDULING,
-      "spucmml: scheduling subtitle >%s< at %lld, current time is %lld\n",
+      "spucmml: scheduling subtitle >%s< at %"PRId64", current time is %"PRId64"\n",
       this->text[0], sub_start,
       this->stream->xine->clock->get_current_time (this->stream->xine->clock));
 }