Mercurial > mplayer.hg

comparison cfg-mplayer.h @ 25230:66f140bbe1bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless ifdefs around extern declarations
author reimar
date Sun, 02 Dec 2007 16:08:07 +0000
parents a677b0782371
children ee5eccc1206d
comparison
equal deleted inserted replaced
25229:4f611a555224 25230:66f140bbe1bc
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 9
10 #ifdef HAVE_FBDEV
11 extern char *fb_mode_cfgfile; 10 extern char *fb_mode_cfgfile;
12 extern char *fb_mode_name; 11 extern char *fb_mode_name;
13 #endif
14 #ifdef HAVE_DIRECTFB
15 extern char *dfb_params; 12 extern char *dfb_params;
16 #endif
17 #ifdef USE_FAKE_MONO
18 extern int fakemono; // defined in dec_audio.c 13 extern int fakemono; // defined in dec_audio.c
19 #endif 14
20
21 #ifdef HAVE_LIRC
22 extern char *lirc_configfile; 15 extern char *lirc_configfile;
23 #endif
24 16
25 extern float vo_panscanrange; 17 extern float vo_panscanrange;
26 /* only used at startup (setting these values from configfile) */ 18 /* only used at startup (setting these values from configfile) */
27 extern char *vo_geometry; 19 extern char *vo_geometry;
28 20
32 extern int vidmode; 24 extern int vidmode;
33 25
34 extern char *ao_outputfilename; 26 extern char *ao_outputfilename;
35 extern int ao_pcm_waveheader; 27 extern int ao_pcm_waveheader;
36 28
37 #ifdef HAVE_X11
38 extern int fs_layer; 29 extern int fs_layer;
39 extern int stop_xscreensaver; 30 extern int stop_xscreensaver;
40 #endif 31
41
42 #ifdef HAVE_MENU
43 extern int menu_startup; 32 extern int menu_startup;
44 extern int menu_keepdir; 33 extern int menu_keepdir;
45 extern char *menu_chroot; 34 extern char *menu_chroot;
46 #ifdef USE_FRIBIDI
47 extern char *menu_fribidi_charset; 35 extern char *menu_fribidi_charset;
48 extern int menu_flip_hebrew; 36 extern int menu_flip_hebrew;
49 extern int menu_fribidi_flip_commas; 37 extern int menu_fribidi_flip_commas;
50 #endif 38
51 #endif /* HAVE_MENU */
52
53 #ifdef HAVE_ZR
54 extern int vo_zr_parseoption(m_option_t* conf, char *opt, char * param); 39 extern int vo_zr_parseoption(m_option_t* conf, char *opt, char * param);
55 extern void vo_zr_revertoption(m_option_t* opt,char* pram); 40 extern void vo_zr_revertoption(m_option_t* opt,char* pram);
56 #endif 41
57
58 #ifdef HAVE_DXR2
59 extern m_option_t dxr2_opts[]; 42 extern m_option_t dxr2_opts[];
60 #endif 43
61
62 #ifdef HAVE_NEW_GUI
63 extern char * skinName; 44 extern char * skinName;
64 extern int guiWinID; 45 extern int guiWinID;
65 #endif
66 46
67 47
68 /* from libvo/aspect.c */ 48 /* from libvo/aspect.c */
69 extern float force_monitor_aspect; 49 extern float force_monitor_aspect;
70 extern float monitor_pixel_aspect; 50 extern float monitor_pixel_aspect;