[MPlayer-cvslog] r23815 - in trunk/gui: cfg.c interface.c mplayer/gmplayer.h mplayer/gtk/mb.h mplayer/gtk/pl.h mplayer/gtk/sb.h mplayer/menu.c mplayer/play.c mplayer/widgets.h wm/ws.c

[diego]

Author: diego
Date: Wed Jul 18 12:09:42 2007
New Revision: 23815

Log:
Fix a bunch of redundant redeclaration warnings.


Modified:
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/gui/mplayer/gmplayer.h
   trunk/gui/mplayer/gtk/mb.h
   trunk/gui/mplayer/gtk/pl.h
   trunk/gui/mplayer/gtk/sb.h
   trunk/gui/mplayer/menu.c
   trunk/gui/mplayer/play.c
   trunk/gui/mplayer/widgets.h
   trunk/gui/wm/ws.c

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	(original)
+++ trunk/gui/cfg.c	Wed Jul 18 12:09:42 2007
@@ -76,9 +76,6 @@ gtkASS_t gtkASS;
 #endif
 // ---
 
-extern char * get_path( const char * filename );
-extern int    flip;
-extern int    frame_dropping;
 extern int    stop_xscreensaver;
 extern int    m_config_parse_config_file(m_config_t* config, char *conffile);
 

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	(original)
+++ trunk/gui/interface.c	Wed Jul 18 12:09:42 2007
@@ -419,7 +419,6 @@ int guiCMDArray[] =
   evSkinBrowser
  };
 
-extern int    		frame_dropping;
 extern int              stream_dump_type;
 extern int  		vcd_track;
 extern m_obj_settings_t * vf_settings;

Modified: trunk/gui/mplayer/gmplayer.h
==============================================================================
--- trunk/gui/mplayer/gmplayer.h	(original)
+++ trunk/gui/mplayer/gmplayer.h	Wed Jul 18 12:09:42 2007
@@ -13,7 +13,6 @@ extern int             mplMainAutoPlay;
 extern int             mplMiddleMenu;
 
 extern void mplInit( void * disp );
-extern void mplEventHandling( int msg,float param );
 
 extern void mplMainDraw( void );
 extern void mplEventHandling( int msg,float param );

Modified: trunk/gui/mplayer/gtk/mb.h
==============================================================================
--- trunk/gui/mplayer/gtk/mb.h	(original)
+++ trunk/gui/mplayer/gtk/mb.h	Wed Jul 18 12:09:42 2007
@@ -4,7 +4,6 @@
 
 #include <gtk/gtk.h>
 
-extern GtkWidget * gtkMessageBoxText;
 extern GtkWidget * MessageBox;
 
 extern GtkWidget * create_MessageBox( int type );

Modified: trunk/gui/mplayer/gtk/pl.h
==============================================================================
--- trunk/gui/mplayer/gtk/pl.h	(original)
+++ trunk/gui/mplayer/gtk/pl.h	Wed Jul 18 12:09:42 2007
@@ -4,8 +4,6 @@
 
 #include <gtk/gtk.h>
 
-extern GtkWidget * PlayList;
-
 extern void ShowPlayList( void );
 extern void HidePlayList( void );
 

Modified: trunk/gui/mplayer/gtk/sb.h
==============================================================================
--- trunk/gui/mplayer/gtk/sb.h	(original)
+++ trunk/gui/mplayer/gtk/sb.h	Wed Jul 18 12:09:42 2007
@@ -3,16 +3,10 @@
 
 #include <gtk/gtk.h>
 
-extern GtkWidget * SkinList;
 extern char      * sbSelectedSkin;
-extern char      * sbMPlayerDirInHome;
-extern char      * sbMPlayerDirInHome_obsolete;
-extern char      * sbMPlayerPrefixDir;
-extern char      * sbMPlayerPrefixDir_obsolete;
 extern GtkWidget * SkinBrowser;
 
 extern void ShowSkinBrowser( void );
-extern int gtkFillSkinList( gchar * mdir );
 extern GtkWidget * create_SkinBrowser( void );
 
 #endif

Modified: trunk/gui/mplayer/menu.c
==============================================================================
--- trunk/gui/mplayer/menu.c	(original)
+++ trunk/gui/mplayer/menu.c	Wed Jul 18 12:09:42 2007
@@ -18,8 +18,6 @@ int             mplOldMenuItem = -1;
 int             mplMenuX,mplMenuY;
 static int      mplMenuIsInitialized = 0;
 
-void mplHideMenu( int mx,int my,int w );
-
 void mplMenuDraw( void )
 {
  uint32_t * buf = NULL;

Modified: trunk/gui/mplayer/play.c
==============================================================================
--- trunk/gui/mplayer/play.c	(original)
+++ trunk/gui/mplayer/play.c	Wed Jul 18 12:09:42 2007
@@ -63,8 +63,6 @@ void mplFullScreen( void )
   else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B );
 }
 
-extern int mplSubRender;
-
 void mplEnd( void )
 {
  plItem * next;

Modified: trunk/gui/mplayer/widgets.h
==============================================================================
--- trunk/gui/mplayer/widgets.h	(original)
+++ trunk/gui/mplayer/widgets.h	Wed Jul 18 12:09:42 2007
@@ -35,6 +35,8 @@ extern int             gtkPopupMenuParam
 
 extern char          * sbMPlayerDirInHome;
 extern char          * sbMPlayerPrefixDir;
+extern char          * sbMPlayerDirInHome_obsolete;
+extern char          * sbMPlayerPrefixDir_obsolete;
 
 extern GdkPixmap * gtkIcon;
 extern GdkBitmap * gtkIconMask;

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	(original)
+++ trunk/gui/wm/ws.c	Wed Jul 18 12:09:42 2007
@@ -50,10 +50,6 @@
 
 #undef ENABLE_DPMS 
 
-#ifdef HAVE_XINERAMA
-extern int xinerama_screen;
-#endif
-
 typedef struct
 {
  unsigned long flags;
@@ -97,7 +93,6 @@ unsigned long        wsKeyTable[512];
 int                  wsUseXShm = 1;
 int                  wsUseXShape = 1;
 
-int XShmGetEventBase( Display* );
 inline int wsSearch( Window win );
 
 // ---