fix compiler warnings at least in xine's native code

CVS patchset: 4330
CVS date: 2003/03/04 10:30:27

6 files changed, 21 insertions, 21 deletions

diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index e8ae92a34..2ef0ab07e 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
  * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
  *
  * 
- * $Id: audio_alsa_out.c,v 1.86 2003/02/28 02:51:47 storri Exp $
+ * $Id: audio_alsa_out.c,v 1.87 2003/03/04 10:30:27 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -443,13 +443,11 @@ static int ao_alsa_get_gap_tolerance (ao_driver_t *this_gen)
  */
 static int ao_alsa_delay (ao_driver_t *this_gen) 
 {
-  snd_pcm_state_t    state;
   snd_pcm_sframes_t delay = 0;
   int err = 0;
-  snd_timestamp_t tstamp;
-  struct timeval now;
   alsa_driver_t *this = (alsa_driver_t *) this_gen;
 #ifdef LOG_DEBUG
+  struct timeval now;
   printf("audio_alsa_out:delay:ENTERED\n");
 #endif
   err=snd_pcm_delay( this->audio_fd, &delay );
@@ -499,7 +497,9 @@ static int ao_alsa_write(ao_driver_t *this_gen,int16_t *data, uint32_t count)
   snd_pcm_sframes_t result;
   snd_pcm_status_t *pcm_stat;
   snd_pcm_state_t    state;
+#ifdef LOG_DEBUG
   struct timeval now;
+#endif
   int wait_result;
   int res;
   uint8_t *buffer=(uint8_t *)data;
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 9b6f4ce85..5bd666456 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -28,7 +28,7 @@
  *   
  *   Based on FFmpeg's libav/rm.c.
  *
- * $Id: demux_real.c,v 1.44 2003/02/28 15:47:52 mroi Exp $
+ * $Id: demux_real.c,v 1.45 2003/03/04 10:30:28 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -723,8 +723,6 @@ static int stream_read_word (demux_real_t *this) {
 static int demux_real_send_chunk(demux_plugin_t *this_gen) {
 
   demux_real_t   *this = (demux_real_t *) this_gen;
-  char            preamble[PREAMBLE_SIZE];
-  unsigned char   data_chunk_header[DATA_CHUNK_HEADER_SIZE];
   char            header[DATA_PACKET_HEADER_SIZE];
   int             stream, size, keyframe;
   uint32_t        timestamp;
@@ -984,7 +982,9 @@ static int demux_real_send_chunk(demux_plugin_t *this_gen) {
 
   /* check if it's time to reload */
   if (!this->current_data_chunk_packet_count && 
-    this->next_data_chunk_offset) {
+      this->next_data_chunk_offset) {
+    char            preamble[PREAMBLE_SIZE];
+    unsigned char   data_chunk_header[DATA_CHUNK_HEADER_SIZE];
 
     /* seek to the next DATA chunk offset */
     this->input->seek(this->input, this->next_data_chunk_offset, SEEK_SET);
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index 76a96d3c7..251dee367 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -22,7 +22,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.5 2003/02/14 04:32:28 tmmm Exp $
+ * $Id: demux_str.c,v 1.6 2003/03/04 10:30:28 mroi Exp $
  */
 
 /* CD-XA format:
@@ -303,7 +303,7 @@ static int open_str_file(demux_str_t *this) {
 	 * sectors with 0 as the type, despite having plenty of
 	 * video/audio sectors
 	 */
-	/*return 0;*/
+	/*return 0*/;
     }
 
     /* seek to the next sector and read in the header */
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index e7394e48d..2819365b4 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,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_dvd.c,v 1.131 2003/02/28 02:51:48 storri Exp $
+ * $Id: input_dvd.c,v 1.132 2003/03/04 10:30:28 mroi Exp $
  *
  */
 
@@ -337,10 +337,10 @@ static void dvd_plugin_dispose (input_plugin_t *this_gen) {
 
 
 static void dvd_build_mrl_list(dvd_input_plugin_t *this) {
-  int num_titles, *num_parts;
 /* FIXME */
-  return;
 #if 0
+  int num_titles, *num_parts;
+
   /* skip DVD if already open */
   if (this->opened) return;
   if (this->class->mrls) {
@@ -411,11 +411,9 @@ static void dvd_build_mrl_list(dvd_input_plugin_t *this) {
     }
     free(num_parts);
   }
+#else
+  return;
 #endif
-
-  /* Reset the VM so that we don't break anything */
-/* FIXME: Is this really needed */
-  dvdnav_reset(this->dvdnav);
 }
 
 static void dvd_plugin_free_buffer(buf_element_t *buf) {
@@ -1568,6 +1566,9 @@ static void *init_class (xine_t *xine, void *data) {
 
 /*
  * $Log: input_dvd.c,v $
+ * Revision 1.132  2003/03/04 10:30:28  mroi
+ * fix compiler warnings at least in xine's native code
+ *
  * Revision 1.131  2003/02/28 02:51:48  storri
  * Xine assert() replacement:
  *
diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c
index 61e8a5e1a..03b0796a8 100644
--- a/src/post/mosaico/mosaico.c
+++ b/src/post/mosaico/mosaico.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: mosaico.c,v 1.7 2003/02/28 14:31:27 skaboy Exp $
+ * $Id: mosaico.c,v 1.8 2003/03/04 10:30:29 mroi Exp $
  */
  
 /*
@@ -450,7 +450,7 @@ static int _mosaico_draw_1(vo_frame_t *frame, post_mosaico_out_t *output) {
 
 static int _mosaico_draw_2(vo_frame_t *frame, post_mosaico_out_t *output, int cont) {
 
-  unsigned long size, i, j, wx, wy, ciclo;
+  unsigned long i, j, wx, wy, ciclo;
   unsigned long zx, zy, wid, wid2, des1, des2, hei;
   unsigned long scalex, scaley, pos_in_x, pos_in_y, pos_in;
   post_video_port_t *port;  
diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c
index e85c5aaa3..c94c0e8e3 100644
--- a/src/video_out/video_out_none.c
+++ b/src/video_out/video_out_none.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_none.c,v 1.12 2003/02/19 13:41:07 esnel Exp $
+ * $Id: video_out_none.c,v 1.13 2003/03/04 10:30:29 mroi Exp $
  *
  * Was originally part of toxine frontend.
  * ...but has now been adapted to xine coding style standards ;)
@@ -111,7 +111,6 @@ static void none_update_frame_format(vo_driver_t *vo_driver, vo_frame_t *vo_fram
 				     uint32_t width, uint32_t height, 
 				     int ratio_code, int format, int flags) {
   none_frame_t  *frame = (none_frame_t *)vo_frame;
-  uint32_t      frame_size = (width * height);
 
   if((frame->width != width) || (frame->height != height) || (frame->format != format)) {