summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 23:01:03 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 23:01:03 +0000
commit0864f92e7a55b20a21fc2f5eaf9e72cb799a6f7d (patch)
treeacd33d7cbfa6a967626858375daa802c652dfe3f /gui
parentd7a5babef76ba9324f303535745af21461bdcc84 (diff)
downloadmpv-0864f92e7a55b20a21fc2f5eaf9e72cb799a6f7d.tar.bz2
mpv-0864f92e7a55b20a21fc2f5eaf9e72cb799a6f7d.tar.xz
Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
-rw-r--r--gui/app.h18
-rw-r--r--gui/cfg.c2
-rw-r--r--gui/cfg.h4
-rw-r--r--gui/interface.h26
-rw-r--r--gui/mplayer/gmplayer.h28
-rw-r--r--gui/mplayer/gtk/about.h4
-rw-r--r--gui/mplayer/gtk/eq.h4
-rw-r--r--gui/mplayer/gtk/fs.c2
-rw-r--r--gui/mplayer/gtk/fs.h6
-rw-r--r--gui/mplayer/gtk/gtk_common.h30
-rw-r--r--gui/mplayer/gtk/gtk_url.h4
-rw-r--r--gui/mplayer/gtk/mb.h4
-rw-r--r--gui/mplayer/gtk/menu.h8
-rw-r--r--gui/mplayer/gtk/opts.h6
-rw-r--r--gui/mplayer/gtk/pl.h6
-rw-r--r--gui/mplayer/gtk/sb.h4
-rw-r--r--gui/mplayer/gui_common.c2
-rw-r--r--gui/mplayer/gui_common.h8
-rw-r--r--gui/mplayer/mw.c2
-rw-r--r--gui/mplayer/pb.c4
-rw-r--r--gui/mplayer/play.h48
-rw-r--r--gui/mplayer/widgets.h24
-rw-r--r--gui/skin/cut.h8
-rw-r--r--gui/skin/font.h16
-rw-r--r--gui/skin/skin.h10
-rw-r--r--gui/win32/dialogs.c4
-rw-r--r--gui/win32/gui.c12
-rw-r--r--gui/win32/gui.h32
-rw-r--r--gui/win32/playlist.h4
-rw-r--r--gui/win32/skinload.h2
-rw-r--r--gui/win32/wincfg.c2
-rw-r--r--gui/wm/ws.h76
32 files changed, 205 insertions, 205 deletions
diff --git a/gui/app.h b/gui/app.h
index 89f7a9e022..51cf978c34 100644
--- a/gui/app.h
+++ b/gui/app.h
@@ -191,14 +191,14 @@ extern char * skinMPlayerDir;
extern char * skinMPlayerDir_obsolete;
extern char * skinName;
-extern void appInitStruct( listItems * item );
-extern void appClearItem( wItem * item );
-extern void appCopy( listItems * item1,listItems * item2 );
-extern int appFindMessage( unsigned char * str );
-extern int appFindKey( unsigned char * name );
-
-extern void btnModify( int event,float state );
-extern float btnGetValue( int event );
-extern void btnSet( int event,int set );
+void appInitStruct( listItems * item );
+void appClearItem( wItem * item );
+void appCopy( listItems * item1, listItems * item2 );
+int appFindMessage( unsigned char * str );
+int appFindKey( unsigned char * name );
+
+void btnModify( int event, float state );
+float btnGetValue( int event );
+void btnSet( int event, int set );
#endif /* MPLAYER_GUI_APP_H */
diff --git a/gui/cfg.c b/gui/cfg.c
index 590f2f9a29..084a44c9f2 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -99,8 +99,8 @@ gtkASS_t gtkASS;
// ---
extern int stop_xscreensaver;
-extern int m_config_parse_config_file(m_config_t* config, char *conffile);
extern int disable_gui_conf;
+int m_config_parse_config_file(m_config_t* config, char *conffile);
static m_config_t * gui_conf;
static const m_option_t gui_opts[] =
diff --git a/gui/cfg.h b/gui/cfg.h
index 8bd8fcc856..be542b0b8a 100644
--- a/gui/cfg.h
+++ b/gui/cfg.h
@@ -73,7 +73,7 @@ typedef struct {
extern gtkASS_t gtkASS;
#endif
-extern int cfg_read( void );
-extern int cfg_write( void );
+int cfg_read( void );
+int cfg_write( void );
#endif /* MPLAYER_GUI_CFG_H */
diff --git a/gui/interface.h b/gui/interface.h
index a739d2c640..63398867fc 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -162,13 +162,13 @@ extern guiInterface_t guiIntfStruct;
extern int use_gui;
-extern void guiInit( void );
-extern void guiDone( void );
-extern int guiGetEvent( int type,char * arg );
-extern void guiEventHandling( void );
-extern void guiLoadFont( void );
-extern void guiLoadSubtitle( char * name );
-extern void guiMessageBox(int level, char * str);
+void guiInit( void );
+void guiDone( void );
+int guiGetEvent( int type,char * arg );
+void guiEventHandling( void );
+void guiLoadFont( void );
+void guiLoadSubtitle( char * name );
+void guiMessageBox(int level, char * str);
typedef struct plItem
{
@@ -223,13 +223,13 @@ extern char * fsHistory[fsPersistant_MaxPos];
extern float gtkEquChannels[6][10];
-extern void * gtkSet( int cmd,float param, void * vparam );
+void * gtkSet( int cmd, float param, void * vparam );
-extern char * gstrdup( const char * str );
-extern int gstrcmp( const char * a,const char * b );
-extern void gfree( void ** p );
-extern void gaddlist( char *** list,const char * entry );
-extern char * gstrchr( char * str,int c );
+char * gstrdup( const char * str );
+int gstrcmp( const char * a, const char * b );
+void gfree( void ** p );
+void gaddlist( char *** list, const char * entry );
+char * gstrchr( char * str, int c );
#define guiSetFilename( s,n ) { gfree( (void **)&s ); s=gstrdup( n ); }
diff --git a/gui/mplayer/gmplayer.h b/gui/mplayer/gmplayer.h
index 213f14e70b..636e6ab570 100644
--- a/gui/mplayer/gmplayer.h
+++ b/gui/mplayer/gmplayer.h
@@ -29,23 +29,23 @@ extern int mainVisible;
extern int mplMainAutoPlay;
extern int mplMiddleMenu;
-extern void mplInit( void * disp );
+void mplInit( void * disp );
-extern void mplMainDraw( void );
-extern void mplEventHandling( int msg,float param );
-extern void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY );
-extern void mplMainKeyHandle( int KeyCode,int Type,int Key );
-extern void mplDandDHandler(int num,char** files);
+void mplMainDraw( void );
+void mplEventHandling( int msg, float param );
+void mplMainMouseHandle( int Button, int X, int Y, int RX, int RY );
+void mplMainKeyHandle( int KeyCode, int Type, int Key );
+void mplDandDHandler(int num, char** files);
-extern void mplSubDraw( void );
-extern void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY );
+void mplSubDraw( void );
+void mplSubMouseHandle( int Button, int X, int Y, int RX, int RY );
-extern void mplMenuInit( void );
-extern void mplHideMenu( int mx,int my,int w );
-extern void mplShowMenu( int mx,int my );
-extern void mplMenuMouseHandle( int X,int Y,int RX,int RY );
+void mplMenuInit( void );
+void mplHideMenu( int mx, int my, int w );
+void mplShowMenu( int mx, int my );
+void mplMenuMouseHandle( int X, int Y, int RX, int RY );
-extern void mplPBInit( void );
-extern void mplPBShow( int x, int y );
+void mplPBInit( void );
+void mplPBShow( int x, int y );
#endif /* MPLAYER_GUI_GMPLAYER_H */
diff --git a/gui/mplayer/gtk/about.h b/gui/mplayer/gtk/about.h
index 7487259147..68997ac51b 100644
--- a/gui/mplayer/gtk/about.h
+++ b/gui/mplayer/gtk/about.h
@@ -23,7 +23,7 @@
extern GtkWidget * About;
-extern GtkWidget * create_About( void );
-extern void ShowAboutBox( void );
+GtkWidget * create_About( void );
+void ShowAboutBox( void );
#endif /* MPLAYER_GUI_ABOUT_H */
diff --git a/gui/mplayer/gtk/eq.h b/gui/mplayer/gtk/eq.h
index 01750b8a51..8d4d5f117f 100644
--- a/gui/mplayer/gtk/eq.h
+++ b/gui/mplayer/gtk/eq.h
@@ -23,7 +23,7 @@
extern GtkWidget * Equalizer;
-extern GtkWidget * create_Equalizer( void );
-extern void ShowEqualizer( void );
+GtkWidget * create_Equalizer( void );
+void ShowEqualizer( void );
#endif /* MPLAYER_GUI_EQ_H */
diff --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c
index fb774dead8..b182594df7 100644
--- a/gui/mplayer/gtk/fs.c
+++ b/gui/mplayer/gtk/fs.c
@@ -43,7 +43,7 @@
#ifndef __linux__
#define get_current_dir_name() getcwd(NULL, PATH_MAX)
#else
-extern char * get_current_dir_name( void );
+char * get_current_dir_name( void );
#endif
gchar * fsSelectedFile = NULL;
diff --git a/gui/mplayer/gtk/fs.h b/gui/mplayer/gtk/fs.h
index 5e00eb7b07..bb0dfe2afd 100644
--- a/gui/mplayer/gtk/fs.h
+++ b/gui/mplayer/gtk/fs.h
@@ -31,9 +31,9 @@
extern GtkWidget * fsFileSelect;
-extern void HideFileSelect( void );
-extern void ShowFileSelect( int type, int modal );
+void HideFileSelect( void );
+void ShowFileSelect( int type, int modal );
-extern GtkWidget * create_FileSelect( void );
+GtkWidget * create_FileSelect( void );
#endif /* MPLAYER_GUI_FS_H */
diff --git a/gui/mplayer/gtk/gtk_common.h b/gui/mplayer/gtk/gtk_common.h
index 34137c9bbb..eff9887e1f 100644
--- a/gui/mplayer/gtk/gtk_common.h
+++ b/gui/mplayer/gtk/gtk_common.h
@@ -22,20 +22,20 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-extern GtkWidget * AddDialogFrame( GtkWidget * parent );
-extern GtkWidget * AddFrame( const char * title,int type,GtkWidget * parent,int add );
-extern GtkWidget * AddLabel( const char * title,GtkWidget * parent );
-extern GtkWidget * AddVBox( GtkWidget * parent,int type );
-extern GtkWidget * AddHBox( GtkWidget * parent,int type );
-extern GtkWidget * AddCheckButton( const char * title, GtkWidget * parent );
-extern GtkWidget * AddRadioButton( const char * title,GSList ** group,GtkWidget * parent );
-extern GtkWidget * AddSpinButton( const char * title,GtkAdjustment * adj,GtkWidget * parent );
-extern GtkWidget * AddButton( const char * title,GtkWidget * parent );
-extern GtkWidget * AddHSeparator( GtkWidget * parent );
-extern GtkWidget * AddHButtonBox( GtkWidget * parent );
-extern GtkWidget * AddHScaler( GtkAdjustment * adj,GtkWidget * parent,int digit );
-extern GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit );
-extern GtkWidget * AddComboBox( GtkWidget * parent );
-extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer );
+GtkWidget * AddDialogFrame( GtkWidget * parent );
+GtkWidget * AddFrame( const char * title, int type, GtkWidget * parent, int add );
+GtkWidget * AddLabel( const char * title, GtkWidget * parent );
+GtkWidget * AddVBox( GtkWidget * parent, int type );
+GtkWidget * AddHBox( GtkWidget * parent, int type );
+GtkWidget * AddCheckButton( const char * title, GtkWidget * parent );
+GtkWidget * AddRadioButton( const char * title, GSList ** group, GtkWidget * parent );
+GtkWidget * AddSpinButton( const char * title, GtkAdjustment * adj, GtkWidget * parent );
+GtkWidget * AddButton( const char * title, GtkWidget * parent );
+GtkWidget * AddHSeparator( GtkWidget * parent );
+GtkWidget * AddHButtonBox( GtkWidget * parent );
+GtkWidget * AddHScaler( GtkAdjustment * adj, GtkWidget * parent, int digit );
+GtkWidget * AddVScaler( GtkAdjustment * adj, GtkWidget * parent, int digit );
+GtkWidget * AddComboBox( GtkWidget * parent );
+void WidgetDestroy( GtkWidget * widget, GtkWidget ** widget_pointer );
#endif /* MPLAYER_GUI_GTK_COMMON_H */
diff --git a/gui/mplayer/gtk/gtk_url.h b/gui/mplayer/gtk/gtk_url.h
index 5398692091..814c053bd4 100644
--- a/gui/mplayer/gtk/gtk_url.h
+++ b/gui/mplayer/gtk/gtk_url.h
@@ -24,7 +24,7 @@
extern GtkWidget * URL;
extern int gtkVURLDialogBox;
-extern void ShowURLDialogBox( void );
-extern GtkWidget * create_URL( void );
+void ShowURLDialogBox( void );
+GtkWidget * create_URL( void );
#endif /* MPLAYER_GUI_GTK_URL_H */
diff --git a/gui/mplayer/gtk/mb.h b/gui/mplayer/gtk/mb.h
index 8274d212ce..75b0a2cc62 100644
--- a/gui/mplayer/gtk/mb.h
+++ b/gui/mplayer/gtk/mb.h
@@ -23,7 +23,7 @@
extern GtkWidget * MessageBox;
-extern GtkWidget * create_MessageBox( int type );
-extern void ShowMessageBox( const char * msg );
+GtkWidget * create_MessageBox( int type );
+void ShowMessageBox( const char * msg );
#endif /* MPLAYER_GUI_MB_H */
diff --git a/gui/mplayer/gtk/menu.h b/gui/mplayer/gtk/menu.h
index 1cdeac3a77..a5e86d70ee 100644
--- a/gui/mplayer/gtk/menu.h
+++ b/gui/mplayer/gtk/menu.h
@@ -23,9 +23,9 @@
extern GtkWidget * DVDSubMenu;
-extern GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm, GtkWidget * SubMenu,const char * label,int Number );
-extern GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, GtkWidget * Menu,const char * label );
-extern GtkWidget * AddSeparator( GtkWidget * Menu );
-extern GtkWidget * create_PopUpMenu( void );
+GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm, GtkWidget * SubMenu, const char * label, int Number );
+GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, GtkWidget * Menu, const char * label );
+GtkWidget * AddSeparator( GtkWidget * Menu );
+GtkWidget * create_PopUpMenu( void );
#endif /* MPLAYER_GUI_MENU_H */
diff --git a/gui/mplayer/gtk/opts.h b/gui/mplayer/gtk/opts.h
index fa9a28abba..b503c4811b 100644
--- a/gui/mplayer/gtk/opts.h
+++ b/gui/mplayer/gtk/opts.h
@@ -25,9 +25,9 @@ extern GtkWidget * AudioConfig;
extern GtkWidget * Preferences;
extern GtkWidget * prEFontName;
-extern GtkWidget * create_Preferences( void );
-extern GtkWidget * create_AudioConfig( void );
+GtkWidget * create_Preferences( void );
+GtkWidget * create_AudioConfig( void );
-extern void ShowPreferences( void );
+void ShowPreferences( void );
#endif /* MPLAYER_GUI_OPTS_H */
diff --git a/gui/mplayer/gtk/pl.h b/gui/mplayer/gtk/pl.h
index 008fcda0ab..003c589847 100644
--- a/gui/mplayer/gtk/pl.h
+++ b/gui/mplayer/gtk/pl.h
@@ -21,9 +21,9 @@
#include <gtk/gtk.h>
-extern void ShowPlayList( void );
-extern void HidePlayList( void );
+void ShowPlayList( void );
+void HidePlayList( void );
-extern GtkWidget * create_PlayList (void);
+GtkWidget * create_PlayList (void);
#endif /* MPLAYER_GUI_PL_H */
diff --git a/gui/mplayer/gtk/sb.h b/gui/mplayer/gtk/sb.h
index 25cea9e597..b9f37a8c48 100644
--- a/gui/mplayer/gtk/sb.h
+++ b/gui/mplayer/gtk/sb.h
@@ -24,7 +24,7 @@
extern char * sbSelectedSkin;
extern GtkWidget * SkinBrowser;
-extern void ShowSkinBrowser( void );
-extern GtkWidget * create_SkinBrowser( void );
+void ShowSkinBrowser( void );
+GtkWidget * create_SkinBrowser( void );
#endif /* MPLAYER_GUI_SB_H */
diff --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c
index 957e85d3b1..d6df8b0f39 100644
--- a/gui/mplayer/gui_common.c
+++ b/gui/mplayer/gui_common.c
@@ -48,7 +48,7 @@
#include "play.h"
#include "widgets.h"
-extern unsigned int GetTimerMS( void );
+unsigned int GetTimerMS( void );
static inline void TranslateFilename( int c,char * tmp,size_t tmplen )
{
diff --git a/gui/mplayer/gui_common.h b/gui/mplayer/gui_common.h
index f5791b02c5..d067d39618 100644
--- a/gui/mplayer/gui_common.h
+++ b/gui/mplayer/gui_common.h
@@ -29,9 +29,9 @@
#include "gui/bitmap.h"
#include "gui/wm/ws.h"
-extern char * Translate( char * str );
-extern void PutImage( txSample * bf,int x,int y,int max,int ofs );
-extern void SimplePotmeterPutImage( txSample * bf,int x,int y,float frac );
-extern void Render( wsTWindow * window,wItem * Items,int nrItems,char * db,int size );
+char * Translate( char * str );
+void PutImage( txSample * bf,int x, int y, int max, int ofs );
+void SimplePotmeterPutImage( txSample * bf, int x, int y, float frac );
+void Render( wsTWindow * window, wItem * Items, int nrItems, char * db, int size );
#endif /* MPLAYER_GUI_GUI_COMMON_H */
diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c
index 6f8866c640..1d9dfbedc8 100644
--- a/gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
@@ -53,7 +53,7 @@
#include "play.h"
#include "widgets.h"
-extern unsigned int GetTimerMS( void );
+unsigned int GetTimerMS( void );
unsigned char * mplDrawBuffer = NULL;
int mplMainRender = 1;
diff --git a/gui/mplayer/pb.c b/gui/mplayer/pb.c
index 80532f6db7..65f28289fe 100644
--- a/gui/mplayer/pb.c
+++ b/gui/mplayer/pb.c
@@ -48,8 +48,8 @@
#include "widgets.h"
#include "gui_common.h"
-extern unsigned int GetTimerMS( void );
-extern unsigned int GetTimer( void );
+unsigned int GetTimerMS( void );
+unsigned int GetTimer( void );
unsigned char * mplPBDrawBuffer = NULL;
int mplPBVisible = 0;
diff --git a/gui/mplayer/play.h b/gui/mplayer/play.h
index 9fed1cf1ca..a96476e530 100644
--- a/gui/mplayer/play.h
+++ b/gui/mplayer/play.h
@@ -23,29 +23,29 @@
extern int mplGotoTheNext;
-extern void mplEnd( void );
-extern void mplFullScreen( void );
-extern void mplPlay( void );
-extern void mplPause( void );
-extern void mplState( void );
-extern void mplPrev( void );
-extern void mplNext( void );
-extern void mplCurr( void );
-
-extern void mplIncAudioBufDelay( void );
-extern void mplDecAudioBufDelay( void );
-
-extern void mplRelSeek( float s );
-extern void mplAbsSeek( float s );
-extern float mplGetPosition( void );
-
-extern void mplPlayFork( void );
-extern void mplSigHandler( int s );
-extern void mplPlayerThread( void );
-
-extern void ChangeSkin( char * name );
-extern void EventHandling( void );
-
-extern void mplSetFileName( char * dir,char * name,int type );
+void mplEnd( void );
+void mplFullScreen( void );
+void mplPlay( void );
+void mplPause( void );
+void mplState( void );
+void mplPrev( void );
+void mplNext( void );
+void mplCurr( void );
+
+void mplIncAudioBufDelay( void );
+void mplDecAudioBufDelay( void );
+
+void mplRelSeek( float s );
+void mplAbsSeek( float s );
+float mplGetPosition( void );
+
+void mplPlayFork( void );
+void mplSigHandler( int s );
+void mplPlayerThread( void );
+
+void ChangeSkin( char * name );
+void EventHandling( void );
+
+void mplSetFileName( char * dir, char * name, int type );
#endif /* MPLAYER_GUI_PLAY_H */
diff --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h
index 811c599e9b..4a6ee40dfe 100644
--- a/gui/mplayer/widgets.h
+++ b/gui/mplayer/widgets.h
@@ -60,21 +60,21 @@ extern GdkBitmap * gtkIconMask;
extern Pixmap guiIcon;
extern Pixmap guiIconMask;
-extern void widgetsCreate( void );
+void widgetsCreate( void );
-extern void gtkInit( void );
-extern void gtkAddIcon( GtkWidget * window );
+void gtkInit( void );
+void gtkAddIcon( GtkWidget * window );
-extern int gtkFillSkinList( gchar * dir );
-extern void gtkClearList( GtkWidget * list );
-extern void gtkSetDefaultToCList( GtkWidget * list,char * item );
-extern int gtkFindCList( GtkWidget * list,char * item );
+int gtkFillSkinList( gchar * dir );
+void gtkClearList( GtkWidget * list );
+void gtkSetDefaultToCList( GtkWidget * list, char * item );
+int gtkFindCList( GtkWidget * list, char * item );
-extern void gtkEventHandling( void );
+void gtkEventHandling( void );
-extern void gtkShow( int type,char * param );
-extern void gtkMessageBox( int type,const gchar * str );
-extern void gtkSetLayer( GtkWidget * wdg );
-extern void gtkActive( GtkWidget * wdg );
+void gtkShow( int type, char * param );
+void gtkMessageBox( int type, const gchar * str );
+void gtkSetLayer( GtkWidget * wdg );
+void gtkActive( GtkWidget * wdg );
#endif /* MPLAYER_GUI_WIDGETS_H */
diff --git a/gui/skin/cut.h b/gui/skin/cut.h
index faee5d5826..a468c7862e 100644
--- a/gui/skin/cut.h
+++ b/gui/skin/cut.h
@@ -19,9 +19,9 @@
#ifndef MPLAYER_GUI_CUT_H
#define MPLAYER_GUI_CUT_H
-extern void cutItem( char * in,char * out,char sep,int num );
-extern int cutItemToInt( char * in,char sep,int num );
-extern float cutItemToFloat( char * in,char sep,int num );
-extern void cutChunk( char * in,char * s1 );
+void cutItem( char * in, char * out, char sep, int num );
+int cutItemToInt( char * in, char sep, int num );
+float cutItemToFloat( char * in, char sep, int num );
+void cutChunk( char * in, char * s1 );
#endif /* MPLAYER_GUI_CUT_H */
diff --git a/gui/skin/font.h b/gui/skin/font.h
index 9ef605c0b7..46c3b36acc 100644
--- a/gui/skin/font.h
+++ b/gui/skin/font.h
@@ -42,13 +42,13 @@ typedef struct
extern txSample Bitmap;
extern bmpFont * Fonts[26];
-extern int fntAddNewFont( char * name );
-extern void fntFreeFont( void );
-extern int fntFindID( char * name );
-extern int fntTextHeight( int id,char * str );
-extern int fntTextWidth( int id,char * str );
-
-extern int fntRead( char * path,char * fname );
-extern txSample * fntRender( wItem * item,int px,const char * fmt,... );
+int fntAddNewFont( char * name );
+void fntFreeFont( void );
+int fntFindID( char * name );
+int fntTextHeight( int id, char * str );
+int fntTextWidth( int id, char * str );
+
+int fntRead( char * path, char * fname );
+txSample * fntRender( wItem * item, int px, const char * fmt, ... );
#endif /* MPLAYER_GUI_FONT_H */
diff --git a/gui/skin/skin.h b/gui/skin/skin.h
index 5c8ffefe3f..20005f2ca8 100644
--- a/gui/skin/skin.h
+++ b/gui/skin/skin.h
@@ -23,13 +23,13 @@
extern listItems * skinAppMPlayer;
-extern int skinRead( char * dname );
-extern int skinBPRead( char * fname, txSample * bf );
+int skinRead( char * dname );
+int skinBPRead( char * fname, txSample * bf );
// ---
-extern char * trimleft( char * in );
-extern char * strswap( char * in,char what,char whereof );
-extern char * trim( char * in );
+char * trimleft( char * in );
+char * strswap( char * in, char what, char whereof );
+char * trim( char * in );
#endif /* MPLAYER_GUI_SKIN_H */
diff --git a/gui/win32/dialogs.c b/gui/win32/dialogs.c
index b750fb9caf..60a8d8c759 100644
--- a/gui/win32/dialogs.c
+++ b/gui/win32/dialogs.c
@@ -40,8 +40,8 @@ extern int vo_gamma_brightness;
extern int vo_gamma_saturation;
extern int vo_gamma_contrast;
extern int vo_gamma_hue;
-extern int set_video_colors(sh_video_t *sh_video, const char *item, int value);
-extern int get_video_colors(sh_video_t *sh_video, const char *item, int *value);
+int set_video_colors(sh_video_t *sh_video, const char *item, int value);
+int get_video_colors(sh_video_t *sh_video, const char *item, int *value);
guiInterface_t guiIntfStruct;
int addurl = 0;
diff --git a/gui/win32/gui.c b/gui/win32/gui.c
index 35268938a6..d9d86f58a3 100644
--- a/gui/win32/gui.c
+++ b/gui/win32/gui.c
@@ -54,9 +54,9 @@
#endif
/* Globals / Externs */
-extern void renderinfobox(skin_t *skin, window_priv_t *priv);
-extern void renderwidget(skin_t *skin, image *dest, widget *item, int state);
-extern void print_version(void);
+void renderinfobox(skin_t *skin, window_priv_t *priv);
+void renderwidget(skin_t *skin, image *dest, widget *item, int state);
+void print_version(void);
float sub_aspect;
DWORD oldtime;
@@ -1086,7 +1086,7 @@ static int GetDesktopBitsPerPixel(void)
}
/* unloads a skin and destroys its windows */
-extern int destroy_window(gui_t *gui)
+int destroy_window(gui_t *gui)
{
RECT rd;
unsigned int i;
@@ -1311,7 +1311,7 @@ static int window_render(gui_t *gui, HWND hWnd, HDC hdc, window_priv_t *priv, wi
}
/* creates the sub (AKA video) window,*/
-extern int create_subwindow(gui_t *gui, char *skindir)
+int create_subwindow(gui_t *gui, char *skindir)
{
HINSTANCE instance = GetModuleHandle(NULL);
WNDCLASS wc;
@@ -1392,7 +1392,7 @@ extern int create_subwindow(gui_t *gui, char *skindir)
}
/* loads/updates a skin and creates windows for it */
-extern int create_window(gui_t *gui, char *skindir)
+int create_window(gui_t *gui, char *skindir)
{
HINSTANCE instance = GetModuleHandle(NULL);
WNDCLASS wc;
diff --git a/gui/win32/gui.h b/gui/win32/gui.h
index 66d78b0cff..d8578dc96f 100644
--- a/gui/win32/gui.h
+++ b/gui/win32/gui.h
@@ -99,23 +99,23 @@ struct gui_t
#define wsMovable 2
#define wsSizeable 4
-extern gui_t *create_gui(char *skindir, char *skinName, void (*playercontrol)(int event));
-extern int destroy_window(gui_t *gui);
-extern int create_window(gui_t *gui, char *skindir);
-extern int create_subwindow(gui_t *gui, char *skindir);
-extern int parse_filename(char *file, play_tree_t *playtree, m_config_t *mconfig, int clear);
-extern void capitalize(char *filename);
-extern int import_playtree_playlist_into_gui(play_tree_t *my_playtree, m_config_t *config);
+gui_t *create_gui(char *skindir, char *skinName, void (*playercontrol)(int event));
+int destroy_window(gui_t *gui);
+int create_window(gui_t *gui, char *skindir);
+int create_subwindow(gui_t *gui, char *skindir);
+int parse_filename(char *file, play_tree_t *playtree, m_config_t *mconfig, int clear);
+void capitalize(char *filename);
+int import_playtree_playlist_into_gui(play_tree_t *my_playtree, m_config_t *config);
/* Dialogs */
-extern void display_playlistwindow(gui_t *gui);
-extern void update_playlistwindow(void);
-extern int display_openfilewindow(gui_t *gui, int add);
-extern void display_openurlwindow(gui_t *gui, int add);
-extern void display_skinbrowser(gui_t *gui);
-extern void display_chapterselwindow(gui_t *gui);
-extern void display_eqwindow(gui_t *gui);
-extern void display_prefswindow(gui_t *gui);
-extern void display_opensubtitlewindow(gui_t *gui);
+void display_playlistwindow(gui_t *gui);
+void update_playlistwindow(void);
+int display_openfilewindow(gui_t *gui, int add);
+void display_openurlwindow(gui_t *gui, int add);
+void display_skinbrowser(gui_t *gui);
+void display_chapterselwindow(gui_t *gui);
+void display_eqwindow(gui_t *gui);
+void display_prefswindow(gui_t *gui);
+void display_opensubtitlewindow(gui_t *gui);
#endif /* MPLAYER_GUI_GUI_H */
diff --git a/gui/win32/playlist.h b/gui/win32/playlist.h
index 52aad4144b..8a3fddd41c 100644
--- a/gui/win32/playlist.h
+++ b/gui/win32/playlist.h
@@ -55,7 +55,7 @@ struct playlist_t
#define SORT_BYTITLE 3
#define SORT_BYDURATION 4
-extern playlist_t *create_playlist(void);
-extern BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive);
+playlist_t *create_playlist(void);
+BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive);
#endif /* MPLAYER_GUI_PLAYLIST_H */
diff --git a/gui/win32/skinload.h b/gui/win32/skinload.h
index e9fac91090..69019d9638 100644
--- a/gui/win32/skinload.h
+++ b/gui/win32/skinload.h
@@ -110,7 +110,7 @@ struct skin_t
image *(*pngRead)(skin_t *skin, unsigned char *fname);
};
-extern skin_t *loadskin(char *skindir, int desktopbpp);
+skin_t *loadskin(char *skindir, int desktopbpp);
// --- Widget types ---
diff --git a/gui/win32/wincfg.c b/gui/win32/wincfg.c
index 05d04db32d..245bbc0be2 100644
--- a/gui/win32/wincfg.c
+++ b/gui/win32/wincfg.c
@@ -55,7 +55,7 @@ int gui_sub_pos_y = -1;
/* External functions */
extern char *proc_priority;
-extern int m_config_parse_config_file(m_config_t *config, char *conffile);
+int m_config_parse_config_file(m_config_t *config, char *conffile);
static m_config_t *gui_conf;
static const m_option_t gui_opts[] =
diff --git a/gui/wm/ws.h b/gui/wm/ws.h
index 73321c6ae9..93cc71244d 100644
--- a/gui/wm/ws.h
+++ b/gui/wm/ws.h
@@ -208,15 +208,15 @@ extern int wsUseXShm;
// ----------------------------------------------------------------------------------------------
extern unsigned long wsKeyTable[512];
-extern void wsXDone( void );
-extern void wsXInit( void* disp );
+void wsXDone( void );
+void wsXInit( void* disp );
-extern int wsGetDepthOnScreen( void );
+int wsGetDepthOnScreen( void );
-extern void wsDoExit( void );
-extern void wsMainLoop( void );
-extern Bool wsEvents( Display * display,XEvent * Event,XPointer arg );
-extern void wsHandleEvents( void );
+void wsDoExit( void );
+void wsMainLoop( void );
+Bool wsEvents( Display * display, XEvent * Event, XPointer arg );
+void wsHandleEvents( vo