*BUGFIX*

Improved cross-compiling: detect and precedence of the host-specific libs
W32dll: enabled by platforms as originaly, user can override it
Fixed shell errors in the Makefile of the hackersguide
Detect the place of SDL header independently on platform
Fixed spelling in CDDA, include the header sys/param.h if available
Fixed format strings (fix warnings (or even bugs) on Gentoo/FreeBSD)

CVS patchset: 7815
CVS date: 2005/11/28 12:24:56

5 files changed, 19 insertions, 18 deletions

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index bb766d155..b28ec201d 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
  * Compact Disc Digital Audio (CDDA) Input Plugin 
  *   by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: input_cdda.c,v 1.80 2005/11/15 13:29:10 miguelfreitas Exp $
+ * $Id: input_cdda.c,v 1.81 2005/11/28 12:24:57 valtri Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 #include <sys/types.h>
-#ifdef SYS_PARAM_H
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #ifdef HAVE_DIRENT_H
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 3b4fe73b3..842f96a49 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -1013,11 +1013,11 @@ static int tuner_tune_it (tuner_t *this, struct dvb_frontend_parameters
 
   strength=0;
   if(ioctl(this->fd_frontend,FE_READ_SIGNAL_STRENGTH,&strength) >= 0)
-    xprintf(this->xine,XINE_VERBOSITY_LOG,"input_dvb: Signal strength: %i\n",strength);
+    xprintf(this->xine,XINE_VERBOSITY_LOG,"input_dvb: Signal strength: %u\n",strength);
 
   strength=0;
   if(ioctl(this->fd_frontend,FE_READ_SNR,&strength) >= 0)
-    xprintf(this->xine,XINE_VERBOSITY_LOG,"input_dvb: Signal/Noise Ratio: %i\n",strength);
+    xprintf(this->xine,XINE_VERBOSITY_LOG,"input_dvb: Signal/Noise Ratio: %u\n",strength);
  
   if (status & FE_HAS_LOCK && !(status & FE_TIMEDOUT)) {
     xprintf(this->xine,XINE_VERBOSITY_LOG,"input_dvb: Lock achieved at %lu Hz\n",(unsigned long)front_param->frequency);   
@@ -2406,7 +2406,7 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen,
       return 0;
   dvb_event_handler (this);
   xprintf(this->class->xine,XINE_VERBOSITY_DEBUG,
-	  "input_dvb: reading %lld bytes...\n", len);
+	  "input_dvb: reading %" PRIdMAX " bytes...\n", (intmax_t)len);
 
 #ifndef DVB_NO_BUFFERING
   nbc_check_buffers (this->nbc); 
@@ -2459,8 +2459,8 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen,
 	  } 
 
       xprintf(this->class->xine,XINE_VERBOSITY_DEBUG,
-	      "input_dvb: got %lld bytes (%lld/%lld bytes read)\n", 
-	      n, total,len);
+	      "input_dvb: got %" PRIdMAX " bytes (%" PRIdMAX "/%" PRIdMAX " bytes read)\n", 
+	      (intmax_t)n, (intmax_t)total, (intmax_t)len);
     
       if (n > 0){  
 	  this->curpos += n;
@@ -2517,7 +2517,7 @@ static off_t dvb_plugin_seek (input_plugin_t *this_gen, off_t offset,
 
   dvb_input_plugin_t *this = (dvb_input_plugin_t *) this_gen;
 
-  xprintf(this->class->xine,XINE_VERBOSITY_DEBUG,"seek %lld bytes, origin %d\n", offset, origin);
+  xprintf(this->class->xine,XINE_VERBOSITY_DEBUG,"seek %" PRIdMAX " bytes, origin %d\n", (intmax_t)offset, origin);
 
   /* only relative forward-seeking is implemented */
 
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 6dd9c8be4..1dd75efc1 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -20,7 +20,7 @@
  * Read from a tcp network stream over a lan (put a tweaked mp1e encoder the
  * other end and you can watch tv anywhere in the house ..)
  *
- * $Id: input_net.c,v 1.64 2005/10/14 21:02:16 miguelfreitas Exp $
+ * $Id: input_net.c,v 1.65 2005/11/28 12:24:57 valtri Exp $
  *
  * how to set up mp1e for use with this plugin:
  * 
@@ -253,7 +253,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen,
   net_input_plugin_t *this = (net_input_plugin_t *) this_gen;
   off_t n, total;
 
-  lprintf("reading %d bytes...\n", len);
+  lprintf("reading %" PRIdMAX " bytes...\n", (intmax_t)len);
 
   total=0;
   if (this->curpos < this->preview_size) {
@@ -261,7 +261,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen,
     if (n > (len - total))
       n = len - total;
 
-    lprintf("%lld bytes from preview (which has %lld bytes)\n", n, this->preview_size);
+    lprintf("%" PRIdMAX " bytes from preview (which has %" PRIdMAX " bytes)\n", (intmax_t)n, (intmax_t)this->preview_size);
 
     memcpy (&buf[total], &this->preview[this->curpos], n);
     this->curpos += n;
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 1445f8a6d..5fd44a0c0 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -38,7 +38,7 @@
  * usage: 
  *   xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
  *
- * $Id: input_pvr.c,v 1.56 2005/10/14 21:02:16 miguelfreitas Exp $
+ * $Id: input_pvr.c,v 1.57 2005/11/28 12:24:57 valtri Exp $
  */
 
 /**************************************************************************
@@ -646,7 +646,7 @@ static int pvr_rec_file(pvr_input_plugin_t *this) {
   pos = (off_t)(this->rec_blk - this->page_block[this->rec_page]) * PVR_BLOCK_SIZE;
   if( lseek (this->rec_fd, pos, SEEK_SET) != pos ) {
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
-	    "input_pvr: error setting position for writing %lld\n", pos);
+	    "input_pvr: error setting position for writing %" PRIdMAX "\n", (intmax_t)pos);
     return 0;
   }
   if( this->rec_fd != -1 ) {
@@ -772,7 +772,7 @@ static int pvr_play_file(pvr_input_plugin_t *this, fifo_buffer_t *fifo, uint8_t
       pos = (off_t)(this->play_blk - this->page_block[this->play_page]) * PVR_BLOCK_SIZE;
       if( lseek (this->play_fd, pos, SEEK_SET) != pos ) {
         xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG,
-		"input_pvr: error setting position for reading %lld\n", pos);
+		"input_pvr: error setting position for reading %" PRIdMAX "\n", (intmax_t)pos);
         return 0;
       }
       if( read(this->play_fd, buffer, PVR_BLOCK_SIZE) < PVR_BLOCK_SIZE ) {
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index f5ad8148d..75743a070 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -118,11 +118,12 @@ void nbc_check_buffers (nbc_t *this) {
 }
 
 static void display_stats (nbc_t *this) {
-  char *buffering[2] = {"   ", "buf"};
-  char *enabled[2]   = {"off", "on "};
+  const char *buffering[2] = {"   ", "buf"};
+  const char *enabled[2]   = {"off", "on "};
   
-  printf("net_buf_ctrl: vid %3d%% %4.1fs %4lldkbps %1d, "\
-	 "aud %3d%% %4.1fs %4lldkbps %1d, %s %s\r",
+  printf("bufing: %d, enb: %d\n", this->buffering, this->enabled);
+  printf("net_buf_ctrl: vid %3d%% %4.1fs %4" PRId64 "kbps %1d, "\
+	 "aud %3d%% %4.1fs %4" PRId64 "kbps %1d, %s %s\r",
 	 this->video_fifo_fill,
 	 (float)(this->video_fifo_length / 1000),
 	 this->video_br / 1000,