diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-03 23:01:03 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-12-03 23:01:03 +0000 |
commit | 0864f92e7a55b20a21fc2f5eaf9e72cb799a6f7d (patch) | |
tree | acd33d7cbfa6a967626858375daa802c652dfe3f | |
parent | d7a5babef76ba9324f303535745af21461bdcc84 (diff) | |
download | mpv-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
109 files changed, 510 insertions, 511 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index d4509c4711..2bfbca1336 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -8,8 +8,8 @@ #include "cfg-common.h" extern int sws_flags; -extern int readPPOpt(void *, char *arg); -extern void revertPPOpt(void *conf, char* opt); +int readPPOpt(void *, char *arg); +void revertPPOpt(void *conf, char* opt); extern char *pp_help; extern m_option_t lameopts_conf[]; @@ -20,7 +20,7 @@ extern m_option_t faacopts_conf[]; extern m_option_t vfwopts_conf[]; extern m_option_t xvidencopts_conf[]; -extern void x264enc_set_param(const m_option_t* opt, char* arg); +void x264enc_set_param(const m_option_t* opt, char* arg); extern m_option_t nuvopts_conf[]; extern m_option_t mpegopts_conf[]; @@ -155,8 +155,8 @@ const m_option_t of_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -extern float avi_aspect_override; /* defined in libmpdemux/muxer_avi.c */ -extern int write_odml; /* defined in libmpdemux/muxer_avi.c */ +float avi_aspect_override; /* defined in libmpdemux/muxer_avi.c */ +int write_odml; /* defined in libmpdemux/muxer_avi.c */ const m_option_t mencoder_opts[]={ /* name, pointer, type, flags, min, max */ diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 09591fe847..3cb810614f 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -40,8 +40,8 @@ extern int menu_fribidi_flip_commas; extern char *unrar_executable; -extern int vo_zr_parseoption(const m_option_t* conf, char *opt, char * param); -extern void vo_zr_revertoption(const m_option_t* opt,char* pram); +int vo_zr_parseoption(const m_option_t* conf, char *opt, char * param); +void vo_zr_revertoption(const m_option_t* opt,char* pram); extern m_option_t dxr2_opts[]; @@ -54,8 +54,8 @@ extern float force_monitor_aspect; extern float monitor_pixel_aspect; extern int sws_flags; -extern int readPPOpt(void *conf, char *arg); -extern void revertPPOpt(void *conf, char* opt); +int readPPOpt(void *conf, char *arg); +void revertPPOpt(void *conf, char* opt); extern char* pp_help; const m_option_t vd_conf[]={ @@ -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 */ @@ -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[] = @@ -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 ); |