[MPlayer-dev-eng] [PATCH] another batch of compilation warnings fixes (GUI too)

[Dominik Mierzejewski]

Updated patches attached.

-- 
MPlayer RPMs maintainer: http://www.piorunek.pl/~dominik/linux/pkgs/mplayer/
"The Universe doesn't give you any points for doing things that are easy."
        -- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"
-------------- next part --------------
--- MPlayer-20021009/Gui/mplayer/gtk/fs.c.gui	Wed Oct  2 00:22:33 2002
+++ MPlayer-20021009/Gui/mplayer/gtk/fs.c	Thu Oct 10 00:19:48 2002
@@ -5,6 +5,7 @@
 #include <sys/stat.h>
 #include <glob.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #include "../mplayer.h"
 
@@ -129,7 +130,7 @@
  int  i,c;
  for ( i=0,c=0;i < strlen( name );i++ )
   {
-   if ( ( name[i] >='a' )&&( name[i] <= 'z' ) ) { tmp[c++]='['; tmp[c++]=name[i]; tmp[c++]=name[i] - 32; tmp[c++]=']'; }
+   if ( isalpha(name[i]) ) { tmp[c++]='['; tmp[c++]=name[i]; tmp[c++]=name[i] - 32; tmp[c++]=']'; }
     else tmp[c++]=name[i];
   }
  tmp[c]=0;
@@ -539,7 +540,7 @@
  GtkWidget     * hseparator2;
  GtkWidget     * hseparator3;
  GtkWidget     * hbuttonbox3;
- int             i;
+/* int             i;*/
 
  GtkWidget     * uppixmapwid;
  GdkPixmap     * uppixmap;
--- MPlayer-20021009/Gui/wm/ws.c.gui	Wed Oct  2 00:22:34 2002
+++ MPlayer-20021009/Gui/wm/ws.c	Thu Oct 10 00:19:48 2002
@@ -94,7 +94,7 @@
 typedef void(*wsTConvFunc)( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels );
 wsTConvFunc wsConvFunc = NULL;
 																															
-void rgb32torgb32( const unsigned char * src, unsigned char * dst,int src_size )
+void rgb32torgb32( const unsigned char * src, unsigned char * dst,unsigned int src_size )
 { memcpy( dst,src,src_size ); }
 
 // ---
@@ -776,7 +776,7 @@
  Atom            type;
  int             format;
  unsigned long   nitems, bytesafter;
- Atom          * args = NULL;
+ unsigned char   * args = NULL;
 
  if ( wsWMType == wsWMIceWM )
   {
--- MPlayer-20021009/Gui/interface.h.gui	Fri Oct  4 00:13:36 2002
+++ MPlayer-20021009/Gui/interface.h	Thu Oct 10 00:19:48 2002
@@ -139,6 +139,7 @@
 extern int  guiGetEvent( int type,char * arg );
 extern void guiEventHandling( void );
 extern void guiLoadFont( void );
+extern void guiLoadSubtitle( char * name );
 
 typedef struct _plItem 
 {
--- MPlayer-20021009/Gui/cfg.c.gui	Fri Oct  4 00:13:36 2002
+++ MPlayer-20021009/Gui/cfg.c	Thu Oct 10 00:19:48 2002
@@ -221,7 +221,7 @@
 	    }
        case CONF_TYPE_STRING_LIST:
             {
-	     char ** tmp = *( (char **)gui_opts[i].p );
+	     char ** tmp = *( (char ***)gui_opts[i].p );
 	     if ( tmp && tmp[0] && tmp[0][0] ) fprintf( f,"%s = \"%s\"\n",gui_opts[i].name,tmp[0] );
 	     break;
 	    }
-------------- next part --------------
--- MPlayer-20021010/libmpcodecs/dec_video.h.warn	Wed Oct  2 00:22:36 2002
+++ MPlayer-20021010/libmpcodecs/dec_video.h	Thu Oct 10 10:17:13 2002
@@ -15,7 +15,7 @@
 extern int get_video_quality_max(sh_video_t *sh_video);
 extern void set_video_quality(sh_video_t *sh_video,int quality);
 
-int get_video_colors(sh_video_t *sh_video,char *item,int *value);
+extern int get_video_colors(sh_video_t *sh_video,char *item,int *value);
 extern int set_video_colors(sh_video_t *sh_video,char *item,int value);
 extern int set_rectangle(sh_video_t *sh_video,int param,int value);
 
--- MPlayer-20021010/libmpcodecs/dec_audio.h.warn	Wed Oct  9 21:40:14 2002
+++ MPlayer-20021010/libmpcodecs/dec_audio.h	Thu Oct 10 10:17:13 2002
@@ -13,4 +13,4 @@
 extern int init_audio_filters(sh_audio_t *sh_audio, 
 	int in_samplerate, int in_channels, int in_format, int in_bps,
 	int out_samplerate, int out_channels, int out_format, int out_bps,
-	int out_minsize, int out_maxsize);
\ No newline at end of file
+	int out_minsize, int out_maxsize);
--- MPlayer-20021010/libmpcodecs/vf_vo.c.warn	Thu Oct 10 10:11:53 2002
+++ MPlayer-20021010/libmpcodecs/vf_vo.c	Thu Oct 10 10:42:26 2002
@@ -14,6 +14,8 @@
 
 #define video_out ((vo_functions_t*)(vf->priv))
 
+static int query_format(struct vf_instance_s* vf, unsigned int fmt); /* forward declaration */
+
 static int config(struct vf_instance_s* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
--- MPlayer-20021010/libvo/x11_common.c.warn	Wed Oct  9 21:40:18 2002
+++ MPlayer-20021010/libvo/x11_common.c	Thu Oct 10 10:17:13 2002
@@ -635,7 +635,7 @@
  Atom            type;
  int             format;
  unsigned long   nitems, bytesafter;
- Atom          * args = NULL;
+ unsigned char   * args = NULL;
 
  if ( WinID >= 0 ) return;
  
--- MPlayer-20021010/mplayer.c.warn	Wed Oct  9 21:39:38 2002
+++ MPlayer-20021010/mplayer.c	Thu Oct 10 10:17:13 2002
@@ -1274,7 +1274,7 @@
   //const ao_info_t *info=audio_out->info;
   current_module="ao2_init";
   if(!(audio_out=init_best_audio_out(audio_driver_list,
-      (ao_plugin_cfg.plugin_list), // plugin flag
+      (ao_plugin_cfg.plugin_list!=NULL), // plugin flag
       force_srate?force_srate:sh_audio->samplerate*playback_speed,
       audio_output_channels?audio_output_channels:
       sh_audio->channels,audio_output_format?audio_output_format: