Mercurial > mplayer.hg

comparison cfg-mplayer.h @ 24368:3fcafaf90457

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author voroshil
date Mon, 10 Sep 2007 01:07:21 +0000
parents 1ffee941dbd3
children e3c4aaf4a61c
comparison
equal deleted inserted replaced
24367:b71c773122cf 24368:3fcafaf90457
4 4
5 #include "cfg-common.h" 5 #include "cfg-common.h"
6 6
7 extern int key_fifo_size; 7 extern int key_fifo_size;
8 extern unsigned doubleclick_time; 8 extern unsigned doubleclick_time;
9 extern int noconsolecontrols;
10 9
11 #ifdef HAVE_FBDEV 10 #ifdef HAVE_FBDEV
12 extern char *fb_mode_cfgfile; 11 extern char *fb_mode_cfgfile;
13 extern char *fb_mode_name; 12 extern char *fb_mode_name;
14 #endif 13 #endif
16 extern char *dfb_params; 15 extern char *dfb_params;
17 #endif 16 #endif
18 #ifdef USE_FAKE_MONO 17 #ifdef USE_FAKE_MONO
19 extern int fakemono; // defined in dec_audio.c 18 extern int fakemono; // defined in dec_audio.c
20 #endif 19 #endif
21
22 extern int volstep;
23 20
24 #ifdef HAVE_LIRC 21 #ifdef HAVE_LIRC
25 extern char *lirc_configfile; 22 extern char *lirc_configfile;
26 #endif 23 #endif
27 24
31 28
32 extern int opt_screen_size_x; 29 extern int opt_screen_size_x;
33 extern int opt_screen_size_y; 30 extern int opt_screen_size_y;
34 extern int fullscreen; 31 extern int fullscreen;
35 extern int vidmode; 32 extern int vidmode;
36
37 extern int osd_level;
38 33
39 extern char *ao_outputfilename; 34 extern char *ao_outputfilename;
40 extern int ao_pcm_waveheader; 35 extern int ao_pcm_waveheader;
41 36
42 #ifdef HAVE_X11 37 #ifdef HAVE_X11
79 74
80 extern int sws_flags; 75 extern int sws_flags;
81 extern int readPPOpt(void *conf, char *arg); 76 extern int readPPOpt(void *conf, char *arg);
82 extern void revertPPOpt(void *conf, char* opt); 77 extern void revertPPOpt(void *conf, char* opt);
83 extern char* pp_help; 78 extern char* pp_help;
84 extern int use_filedir_conf;
85 79
86 m_option_t vd_conf[]={ 80 m_option_t vd_conf[]={
87 {"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}, 81 {"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},
88 {NULL, NULL, 0, 0, 0, 0, NULL} 82 {NULL, NULL, 0, 0, 0, 0, NULL}
89 }; 83 };