mirror of https://github.com/mpv-player/mpv
Fix a bunch of redundant redeclaration warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23815 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
fe72927d6b
commit
f2a8f10af2
|
@ -76,9 +76,6 @@ gtkASS_t gtkASS;
|
||||||
#endif
|
#endif
|
||||||
// ---
|
// ---
|
||||||
|
|
||||||
extern char * get_path( const char * filename );
|
|
||||||
extern int flip;
|
|
||||||
extern int frame_dropping;
|
|
||||||
extern int stop_xscreensaver;
|
extern int stop_xscreensaver;
|
||||||
extern int m_config_parse_config_file(m_config_t* config, char *conffile);
|
extern int m_config_parse_config_file(m_config_t* config, char *conffile);
|
||||||
|
|
||||||
|
|
|
@ -419,7 +419,6 @@ int guiCMDArray[] =
|
||||||
evSkinBrowser
|
evSkinBrowser
|
||||||
};
|
};
|
||||||
|
|
||||||
extern int frame_dropping;
|
|
||||||
extern int stream_dump_type;
|
extern int stream_dump_type;
|
||||||
extern int vcd_track;
|
extern int vcd_track;
|
||||||
extern m_obj_settings_t * vf_settings;
|
extern m_obj_settings_t * vf_settings;
|
||||||
|
|
|
@ -13,7 +13,6 @@ extern int mplMainAutoPlay;
|
||||||
extern int mplMiddleMenu;
|
extern int mplMiddleMenu;
|
||||||
|
|
||||||
extern void mplInit( void * disp );
|
extern void mplInit( void * disp );
|
||||||
extern void mplEventHandling( int msg,float param );
|
|
||||||
|
|
||||||
extern void mplMainDraw( void );
|
extern void mplMainDraw( void );
|
||||||
extern void mplEventHandling( int msg,float param );
|
extern void mplEventHandling( int msg,float param );
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
extern GtkWidget * gtkMessageBoxText;
|
|
||||||
extern GtkWidget * MessageBox;
|
extern GtkWidget * MessageBox;
|
||||||
|
|
||||||
extern GtkWidget * create_MessageBox( int type );
|
extern GtkWidget * create_MessageBox( int type );
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
extern GtkWidget * PlayList;
|
|
||||||
|
|
||||||
extern void ShowPlayList( void );
|
extern void ShowPlayList( void );
|
||||||
extern void HidePlayList( void );
|
extern void HidePlayList( void );
|
||||||
|
|
||||||
|
|
|
@ -3,16 +3,10 @@
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
extern GtkWidget * SkinList;
|
|
||||||
extern char * sbSelectedSkin;
|
extern char * sbSelectedSkin;
|
||||||
extern char * sbMPlayerDirInHome;
|
|
||||||
extern char * sbMPlayerDirInHome_obsolete;
|
|
||||||
extern char * sbMPlayerPrefixDir;
|
|
||||||
extern char * sbMPlayerPrefixDir_obsolete;
|
|
||||||
extern GtkWidget * SkinBrowser;
|
extern GtkWidget * SkinBrowser;
|
||||||
|
|
||||||
extern void ShowSkinBrowser( void );
|
extern void ShowSkinBrowser( void );
|
||||||
extern int gtkFillSkinList( gchar * mdir );
|
|
||||||
extern GtkWidget * create_SkinBrowser( void );
|
extern GtkWidget * create_SkinBrowser( void );
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -18,8 +18,6 @@ int mplOldMenuItem = -1;
|
||||||
int mplMenuX,mplMenuY;
|
int mplMenuX,mplMenuY;
|
||||||
static int mplMenuIsInitialized = 0;
|
static int mplMenuIsInitialized = 0;
|
||||||
|
|
||||||
void mplHideMenu( int mx,int my,int w );
|
|
||||||
|
|
||||||
void mplMenuDraw( void )
|
void mplMenuDraw( void )
|
||||||
{
|
{
|
||||||
uint32_t * buf = NULL;
|
uint32_t * buf = NULL;
|
||||||
|
|
|
@ -63,8 +63,6 @@ void mplFullScreen( void )
|
||||||
else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B );
|
else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B );
|
||||||
}
|
}
|
||||||
|
|
||||||
extern int mplSubRender;
|
|
||||||
|
|
||||||
void mplEnd( void )
|
void mplEnd( void )
|
||||||
{
|
{
|
||||||
plItem * next;
|
plItem * next;
|
||||||
|
|
|
@ -35,6 +35,8 @@ extern int gtkPopupMenuParam;
|
||||||
|
|
||||||
extern char * sbMPlayerDirInHome;
|
extern char * sbMPlayerDirInHome;
|
||||||
extern char * sbMPlayerPrefixDir;
|
extern char * sbMPlayerPrefixDir;
|
||||||
|
extern char * sbMPlayerDirInHome_obsolete;
|
||||||
|
extern char * sbMPlayerPrefixDir_obsolete;
|
||||||
|
|
||||||
extern GdkPixmap * gtkIcon;
|
extern GdkPixmap * gtkIcon;
|
||||||
extern GdkBitmap * gtkIconMask;
|
extern GdkBitmap * gtkIconMask;
|
||||||
|
|
|
@ -50,10 +50,6 @@
|
||||||
|
|
||||||
#undef ENABLE_DPMS
|
#undef ENABLE_DPMS
|
||||||
|
|
||||||
#ifdef HAVE_XINERAMA
|
|
||||||
extern int xinerama_screen;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -97,7 +93,6 @@ unsigned long wsKeyTable[512];
|
||||||
int wsUseXShm = 1;
|
int wsUseXShm = 1;
|
||||||
int wsUseXShape = 1;
|
int wsUseXShape = 1;
|
||||||
|
|
||||||
int XShmGetEventBase( Display* );
|
|
||||||
inline int wsSearch( Window win );
|
inline int wsSearch( Window win );
|
||||||
|
|
||||||
// ---
|
// ---
|
||||||
|
|
Loading…
Reference in New Issue