[Mplayer-cvslog] CVS: main mplayer.c,1.695,1.696 playtreeparser.h,1.4,1.5

[Dominik Mierzejewski]

On Sunday, 22 June 2003, Attila Kinali wrote:
> On Fri, 30 May 2003 19:53:06 +0200
> Alex Beregszaszi <alex at mplayerhq.hu> wrote:
> 
> > Update of /cvsroot/mplayer/main
> > In directory mail:/var/tmp.root/cvs-serv13601
> > 
> > Modified Files:
> > 	mplayer.c playtreeparser.h 
> > Log Message:
> > warning fixes by Dominik Mierzejewski <dominik at rangers.eu.org>
> > 
> > Index: mplayer.c
> > ===================================================================
> > RCS file: /cvsroot/mplayer/main/mplayer.c,v
> > retrieving revision 1.695
> > retrieving revision 1.696
> > diff -u -r1.695 -r1.696
> > --- mplayer.c	23 May 2003 15:01:02 -0000	1.695
> > +++ mplayer.c	30 May 2003 17:53:03 -0000	1.696
> > @@ -49,6 +49,10 @@
> >  #include "libvo/font_load.h"
> >  #include "libvo/sub.h"
> >  
> > +#ifdef HAVE_X11
> > +#include "libvo/x11_common.h"
> > +#endif
> 
> What's the sense of this ? mplayer.c doesnt have any reference to
> the x11 vo system (at least i didnt find any).

Let me refresh my memory... Ah, yes:
mplayer.c:910: warning: implicit declaration of function `fstype_help'
$ grep fstype_help libvo/x11_common.h
extern void fstype_help(void);

OK, I guess you could change this into just declaring that extern.
How's that:
--- MPlayer-20030619/mplayer.c.warn     Sun Jun 22 22:07:14 2003
+++ MPlayer-20030619/mplayer.c  Sun Jun 22 22:10:11 2003
@@ -50,7 +50,7 @@
 #include "libvo/sub.h"

 #ifdef HAVE_X11
-#include "libvo/x11_common.h"
+extern void fstype_help(void);
 #endif

 #include "libao2/audio_out.h"


> >  #include "libao2/audio_out.h"
> >  #include "libao2/audio_plugin.h"
> >  
> > @@ -107,6 +111,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);
> Same here, there is no reference to 
> import_initial_playtree_into_gui in mplayer.c

Really?
line 620
      import_playtree_playlist_into_gui(entry, mconfig);
line 853:
      import_initial_playtree_into_gui(playtree, mconfig, enqueue);

-- 
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"