[MPlayer-dev-eng] Call for unapplied patches

[Dominik Mierzejewski]

On Saturday, 24 May 2003, Diego Biurrun wrote:
> Dominik Mierzejewski writes:
>  > On Friday, 23 May 2003, Alex Beregszaszi wrote:
>  > > are there any patches without reaction?
>  > 
>  > For main or 0_90?
> 
> I would assume this applies to both types of patches.

In that case, here's one attempt to silence some of the remaining compiler
warnings (attached). Don't pay attention to the date in dir name, it still
applies to current 0_90 CVS.

A word of explanation of this:
--- MPlayer-20030323/mplayer.c.warn     Mon Mar 17 08:42:13 2003
+++ MPlayer-20030323/mplayer.c  Sun Mar 23 12:24:40 2003
@@ -44,6 +44,10 @@
 #include "libvo/font_load.h"
 #include "libvo/sub.h"
        
+#ifdef HAVE_X11
+#include "libvo/x11_common.h"
+#endif
+
 #include "libao2/audio_out.h"
 #include "libao2/audio_plugin.h"

It fixes the following warning:
mplayer.c: In function `main':
mplayer.c:847: warning: implicit declaration of function `fstype_help'

The rest should be more or less obvious.

-- 
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-20030323/TOOLS/subfont-c/subfont.c.warn	Sat Jan  4 12:41:13 2003
+++ MPlayer-20030323/TOOLS/subfont-c/subfont.c	Sun Mar 23 12:24:39 2003
@@ -27,7 +27,7 @@
 
 
 #include "../../bswap.h"
-
+#include "../../linux/timer.h"
 
 #ifndef DEBUG
 #define DEBUG	0
--- MPlayer-20030323/libao2/pl_format.c.warn	Sun Mar 23 12:22:05 2003
+++ MPlayer-20030323/libao2/pl_format.c	Sun Mar 23 12:24:39 2003
@@ -228,7 +228,7 @@
       switch(pl_format.in&SIGN_MASK){
       case(US):
 	for(i=0;i<len;i++)
-	((int32_t*)in_data)[i]=(int32_t)(((uint32_t*)in_data)[i]-0x80000000);
+	((int32_t*)in_data)[i]=(int32_t)(-0x7FFFFFFF+((uint32_t*)in_data)[i]);
 	break;
       case(SI):
 	for(i=0;i<len;i++)
--- MPlayer-20030323/libmpdemux/demux_xmms.c.warn	Sun Feb  2 02:38:29 2003
+++ MPlayer-20030323/libmpdemux/demux_xmms.c	Sun Mar 23 12:24:39 2003
@@ -142,7 +142,7 @@
 static int no_plugins=0;
 
 /* Dummy functions  */
-static int input_get_vis_type(){return 0;}
+static InputVisType input_get_vis_type(){return 0;}
 static void input_add_vis_pcm(int time, AFormat fmt, int nch, int length, void *ptr){}
 static void input_set_info_text(char * text){}
 char *xmms_get_gentitle_format(){ return ""; }
--- MPlayer-20030323/libvo/vo_dga.c.warn	Tue Feb  4 17:14:54 2003
+++ MPlayer-20030323/libvo/vo_dga.c	Sun Mar 23 12:24:40 2003
@@ -555,6 +555,7 @@
        // as long as it's above 50 Hz (acki2 on 30/3/2001)
        ||
        (
+	(
 	(new_x == *old_x) &&
 	(new_y == *old_y) &&
 	(
@@ -568,6 +569,7 @@
 	  new_vbi >= 50
 	 )
 	)
+	)
         ||
         // if everything is equal, then use the mode with the lower 
         // stride 
--- MPlayer-20030323/libvo/vo_x11.c.warn	Tue Feb  4 19:31:44 2003
+++ MPlayer-20030323/libvo/vo_x11.c	Sun Mar 23 12:24:40 2003
@@ -262,7 +262,7 @@
    depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual);
  }
  if ( !XMatchVisualInfo( mDisplay,mScreen,depth,DirectColor,&vinfo ) ||
-      WinID > 0 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))
+      ( WinID > 0 && vinfo.visualid != XVisualIDFromVisual(attribs.visual)) )
    XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );
 
  /* set image size (which is indeed neither the input nor output size), 
--- MPlayer-20030323/libvo/x11_common.c.warn	Mon Feb 10 21:48:59 2003
+++ MPlayer-20030323/libvo/x11_common.c	Sun Mar 23 12:24:40 2003
@@ -254,6 +254,8 @@
  XA_INIT(_BLACKBOX_PID);
 }
 
+int vo_x11_get_fs_type( int supported ); /* forward declaration */
+
 int vo_init( void )
 {
 // int       mScreen;
--- MPlayer-20030323/mplayer.c.warn	Mon Mar 17 08:42:13 2003
+++ MPlayer-20030323/mplayer.c	Sun Mar 23 12:24:40 2003
@@ -44,6 +44,10 @@
 #include "libvo/font_load.h"
 #include "libvo/sub.h"
 
+#ifdef HAVE_X11
+#include "libvo/x11_common.h"
+#endif
+
 #include "libao2/audio_out.h"
 #include "libao2/audio_plugin.h"
 
@@ -96,6 +100,12 @@
 //             Playtree
 //**************************************************************************//
 #include "playtree.h"
+#include "playtreeparser.h"
+
+#ifdef HAVE_NEW_GUI
+extern int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config);
+extern int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* config, int enqueue);
+#endif
 
 play_tree_t* playtree;
 play_tree_iter_t* playtree_iter = NULL;
--- MPlayer-20030323/playtreeparser.h.warn	Sun Jan 12 20:41:37 2003
+++ MPlayer-20030323/playtreeparser.h	Sun Mar 23 12:24:40 2003
@@ -21,4 +21,7 @@
 play_tree_t*
 play_tree_parser_get_play_tree(play_tree_parser_t* p, int forced);
 
+void
+play_tree_add_bpf(play_tree_t* pt, char* filename);
+
 #endif