Fix warnings: cfg-mplayer.h:9: warning: redundant redeclaration of 'noconsolecontrols' mplayer.c:191: warning: previous definition of 'noconsolecontrols' was here cfg-mplayer.h:22: warning: redundant redeclaration of 'volstep' mplayer.c:566: warning: previous definition of 'volstep' was here cfg-mplayer.h:37: warning: redundant redeclaration of 'osd_level' mplayer.c:235: warning: previous definition of 'osd_level' was here cfg-mplayer.h:82: warning: redundant redeclaration of 'use_filedir_conf' mplayer.c:370: warning: previous declaration of 'use_filedir_conf' was here Index: mplayer/cfg-mplayer.h =================================================================== --- mplayer/cfg-mplayer.h (revision 24385) +++ mplayer/cfg-mplayer.h (working copy) @@ -6,7 +6,6 @@ extern int key_fifo_size; extern unsigned doubleclick_time; -extern int noconsolecontrols; #ifdef HAVE_FBDEV extern char *fb_mode_cfgfile; @@ -19,8 +18,6 @@ extern int fakemono; // defined in dec_audio.c #endif -extern int volstep; - #ifdef HAVE_LIRC extern char *lirc_configfile; #endif @@ -34,8 +31,6 @@ extern int fullscreen; extern int vidmode; -extern int osd_level; - extern char *ao_outputfilename; extern int ao_pcm_waveheader; @@ -81,7 +76,6 @@ extern int readPPOpt(void *conf, char *arg); extern void revertPPOpt(void *conf, char* opt); extern char* pp_help; -extern int use_filedir_conf; m_option_t vd_conf[]={ {"help", "Use MPlayer with an appropriate video file instead of live partners to avoid vd.\n", CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},