Mercurial > mplayer.hg

comparison cfg-mplayer.h @ 24365:1ffee941dbd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix redundant declaration warnings for variables already defined in libvo/video_out.h
author voroshil
date Sun, 09 Sep 2007 15:05:33 +0000
parents 93510574eb68
children 3fcafaf90457
comparison
equal deleted inserted replaced
24364:e8ce0e1777d9 24365:1ffee941dbd3
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; 9 extern int noconsolecontrols;
10 10
11 #if defined(HAVE_FBDEV)||defined(HAVE_VESA)
12 extern char *monitor_hfreq_str;
13 extern char *monitor_vfreq_str;
14 extern char *monitor_dotclock_str;
15 #endif
16
17 #ifdef HAVE_FBDEV 11 #ifdef HAVE_FBDEV
18 extern char *fb_mode_cfgfile; 12 extern char *fb_mode_cfgfile;
19 extern char *fb_mode_name; 13 extern char *fb_mode_name;
20 #endif 14 #endif
21 #ifdef HAVE_DIRECTFB 15 #ifdef HAVE_DIRECTFB
29 23
30 #ifdef HAVE_LIRC 24 #ifdef HAVE_LIRC
31 extern char *lirc_configfile; 25 extern char *lirc_configfile;
32 #endif 26 #endif
33 27
34 extern int vo_doublebuffering;
35 extern int vo_vsync;
36 extern int vo_fsmode;
37 extern int vo_dbpp;
38 extern int vo_directrendering;
39 extern float vo_panscan;
40 extern float vo_panscanrange; 28 extern float vo_panscanrange;
41 /* only used at startup (setting these values from configfile) */ 29 /* only used at startup (setting these values from configfile) */
42 extern int vo_gamma_brightness;
43 extern int vo_gamma_saturation;
44 extern int vo_gamma_contrast;
45 extern int vo_gamma_hue;
46 extern char *vo_geometry; 30 extern char *vo_geometry;
47 extern int vo_ontop;
48 extern int vo_border;
49 extern int vo_keepaspect;
50 extern int vo_rootwin;
51 31
52 extern int opt_screen_size_x; 32 extern int opt_screen_size_x;
53 extern int opt_screen_size_y; 33 extern int opt_screen_size_y;
54 extern int fullscreen; 34 extern int fullscreen;
55 extern int vidmode; 35 extern int vidmode;
63 extern char *mDisplayName; 43 extern char *mDisplayName;
64 extern int fs_layer; 44 extern int fs_layer;
65 extern int stop_xscreensaver; 45 extern int stop_xscreensaver;
66 extern char **vo_fstype_list; 46 extern char **vo_fstype_list;
67 #endif 47 #endif
68 extern int vo_nomouse_input;
69 extern int WinID;
70 48
71 #ifdef HAVE_MENU 49 #ifdef HAVE_MENU
72 extern int menu_startup; 50 extern int menu_startup;
73 extern int menu_keepdir; 51 extern int menu_keepdir;
74 extern char *menu_chroot; 52 extern char *menu_chroot;
92 extern char * skinName; 70 extern char * skinName;
93 extern int enqueue; 71 extern int enqueue;
94 extern int guiWinID; 72 extern int guiWinID;
95 #endif 73 #endif
96 74
97 #ifdef HAVE_XINERAMA
98 extern int xinerama_screen;
99 #endif
100 75
101 /* from libvo/aspect.c */ 76 /* from libvo/aspect.c */
102 extern float force_monitor_aspect; 77 extern float force_monitor_aspect;
103 extern float monitor_pixel_aspect; 78 extern float monitor_pixel_aspect;
104 79
105 extern int sws_flags; 80 extern int sws_flags;
106 extern int readPPOpt(void *conf, char *arg); 81 extern int readPPOpt(void *conf, char *arg);
107 extern void revertPPOpt(void *conf, char* opt); 82 extern void revertPPOpt(void *conf, char* opt);
108 extern char* pp_help; 83 extern char* pp_help;
109 extern int enable_mouse_movements;
110 extern int use_filedir_conf; 84 extern int use_filedir_conf;
111 85
112 m_option_t vd_conf[]={ 86 m_option_t vd_conf[]={
113 {"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}, 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},
114 {NULL, NULL, 0, 0, 0, 0, NULL} 88 {NULL, NULL, 0, 0, 0, 0, NULL}