annotate cfg-mplayer.h @ 11376:70b1673fe399

proper fix for 'some chipsets can't handle buffers > 128kB', vo_zr used to ignore information about the _actual_ buffer size returned by the kernel and continued to use the requested buffer size (the old fix was to request smaller buffers, but not ignoring information about the actual buffer size is way better)
author rik
date Mon, 03 Nov 2003 17:38:50 +0000
parents 119703388a95
children 85e503ddf65f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
1 /*
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
2 * config for cfgparser
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
3 */
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
4
2790
98769cea155c added tv subsystem
alex
parents: 2647
diff changeset
5 #include "cfg-common.h"
98769cea155c added tv subsystem
alex
parents: 2647
diff changeset
6
4891
30798db9527f New option use-stdin
albeu
parents: 4859
diff changeset
7 extern int use_stdin;
1536
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
8
7069
21e1ab99cb21 General Timing Formula algorithm from a scratch.
arpi
parents: 7019
diff changeset
9 #if defined(HAVE_FBDEV)||defined(HAVE_VESA)
21e1ab99cb21 General Timing Formula algorithm from a scratch.
arpi
parents: 7019
diff changeset
10 extern char *monitor_hfreq_str;
21e1ab99cb21 General Timing Formula algorithm from a scratch.
arpi
parents: 7019
diff changeset
11 extern char *monitor_vfreq_str;
21e1ab99cb21 General Timing Formula algorithm from a scratch.
arpi
parents: 7019
diff changeset
12 extern char *monitor_dotclock_str;
21e1ab99cb21 General Timing Formula algorithm from a scratch.
arpi
parents: 7019
diff changeset
13 #endif
21e1ab99cb21 General Timing Formula algorithm from a scratch.
arpi
parents: 7019
diff changeset
14
378
6e813c134226 variables related to fbdev moved to cfg-mplayer.h
szabii
parents: 363
diff changeset
15 #ifdef HAVE_FBDEV
6e813c134226 variables related to fbdev moved to cfg-mplayer.h
szabii
parents: 363
diff changeset
16 extern char *fb_dev_name;
6e813c134226 variables related to fbdev moved to cfg-mplayer.h
szabii
parents: 363
diff changeset
17 extern char *fb_mode_cfgfile;
6e813c134226 variables related to fbdev moved to cfg-mplayer.h
szabii
parents: 363
diff changeset
18 extern char *fb_mode_name;
3275
38344371432f vo DirectFB support by Jiri Svoboda <Jiri.Svoboda@seznam.cz>
arpi
parents: 3272
diff changeset
19 #else
38344371432f vo DirectFB support by Jiri Svoboda <Jiri.Svoboda@seznam.cz>
arpi
parents: 3272
diff changeset
20 #ifdef HAVE_DIRECTFB
38344371432f vo DirectFB support by Jiri Svoboda <Jiri.Svoboda@seznam.cz>
arpi
parents: 3272
diff changeset
21 extern char *fb_dev_name;
38344371432f vo DirectFB support by Jiri Svoboda <Jiri.Svoboda@seznam.cz>
arpi
parents: 3272
diff changeset
22 #endif
378
6e813c134226 variables related to fbdev moved to cfg-mplayer.h
szabii
parents: 363
diff changeset
23 #endif
8137
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
24 #ifdef HAVE_DIRECTFB
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
25 #if DIRECTFBVERSION > 912
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
26 extern char *dfb_params;
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
27 #endif
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
28 #endif
526
e537bdec1ecc added png out support (-z switch)
atmosfear
parents: 515
diff changeset
29 #ifdef HAVE_PNG
e537bdec1ecc added png out support (-z switch)
atmosfear
parents: 515
diff changeset
30 extern int z_compression;
e537bdec1ecc added png out support (-z switch)
atmosfear
parents: 515
diff changeset
31 #endif
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
32 #ifdef HAVE_JPEG
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
33 extern int jpeg_baseline;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
34 extern int jpeg_progressive_mode;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
35 extern int jpeg_optimize;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
36 extern int jpeg_smooth;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
37 extern int jpeg_quality;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
38 extern char * jpeg_outdir;
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
39 #endif
636
10c88fb49133 New switches for sdl added.
atmosfear
parents: 626
diff changeset
40 #ifdef HAVE_SDL
1187
9a8058213061 sdl_(a)driver liquidated - sorry atmos
al3x
parents: 1149
diff changeset
41 //extern char *sdl_driver;
636
10c88fb49133 New switches for sdl added.
atmosfear
parents: 626
diff changeset
42 extern int sdl_noxv;
10c88fb49133 New switches for sdl added.
atmosfear
parents: 626
diff changeset
43 extern int sdl_forcexv;
1187
9a8058213061 sdl_(a)driver liquidated - sorry atmos
al3x
parents: 1149
diff changeset
44 //extern char *sdl_adriver;
636
10c88fb49133 New switches for sdl added.
atmosfear
parents: 626
diff changeset
45 #endif
732
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 725
diff changeset
46 #ifdef USE_FAKE_MONO
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 725
diff changeset
47 extern int fakemono; // defined in dec_audio.c
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 725
diff changeset
48 #endif
636
10c88fb49133 New switches for sdl added.
atmosfear
parents: 626
diff changeset
49
1149
6a0f937b52e6 - new config option -lircconfig (config file for lirc)
acki2
parents: 1124
diff changeset
50 #ifdef HAVE_LIRC
6a0f937b52e6 - new config option -lircconfig (config file for lirc)
acki2
parents: 1124
diff changeset
51 extern char *lirc_configfile;
6a0f937b52e6 - new config option -lircconfig (config file for lirc)
acki2
parents: 1124
diff changeset
52 #endif
6a0f937b52e6 - new config option -lircconfig (config file for lirc)
acki2
parents: 1124
diff changeset
53
6a0f937b52e6 - new config option -lircconfig (config file for lirc)
acki2
parents: 1124
diff changeset
54 extern int vo_doublebuffering;
4667
95fa3901cafc add vsync support for doublebuffering to vo_vesa
atmos4
parents: 4494
diff changeset
55 extern int vo_vsync;
1267
ac5c8926a2d6 -fsmode
arpi
parents: 1255
diff changeset
56 extern int vo_fsmode;
585
96621b6b7f9f added: extern int vo_dbpp
arpi_esp
parents: 570
diff changeset
57 extern int vo_dbpp;
6779
c5e08b7c048c eq handling reworked
alex
parents: 6671
diff changeset
58 extern int vo_directrendering;
c5e08b7c048c eq handling reworked
alex
parents: 6671
diff changeset
59 extern float vo_panscan;
c5e08b7c048c eq handling reworked
alex
parents: 6671
diff changeset
60 /* only used by startup (setting these values from configfile) */
4229
9a33ad2f3547 gamma correction support
nick
parents: 4213
diff changeset
61 extern int vo_gamma_brightness;
9a33ad2f3547 gamma correction support
nick
parents: 4213
diff changeset
62 extern int vo_gamma_saturation;
9a33ad2f3547 gamma correction support
nick
parents: 4213
diff changeset
63 extern int vo_gamma_contrast;
9a33ad2f3547 gamma correction support
nick
parents: 4213
diff changeset
64 extern int vo_gamma_hue;
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents: 7864
diff changeset
65 extern char *vo_geometry;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1414
diff changeset
66
7451
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7359
diff changeset
67 extern int opt_screen_size_x;
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7359
diff changeset
68 extern int opt_screen_size_y;
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7359
diff changeset
69 extern int fullscreen;
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7359
diff changeset
70 extern int vidmode;
8669e56d2d98 some mpcodecs option declaration moved to cfg-*, as aren;t used by
arpi
parents: 7359
diff changeset
71
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1414
diff changeset
72 #ifdef USE_OSD
641
d161307f447a The -osdlevel switch for setting default OSD level (useful in your .config for example if you don't like watching OSD timer by default)
lgb
parents: 636
diff changeset
73 extern int osd_level;
1422
d02e0dcaf077 libvo2 support
arpi
parents: 1414
diff changeset
74 #endif
378
6e813c134226 variables related to fbdev moved to cfg-mplayer.h
szabii
parents: 363
diff changeset
75
1112
b1cf1087ec33 Added support for writing wave files and specifying filename to write to.
atmosfear
parents: 1038
diff changeset
76 extern char *ao_outputfilename;
b1cf1087ec33 Added support for writing wave files and specifying filename to write to.
atmosfear
parents: 1038
diff changeset
77 extern int ao_pcm_waveheader;
b1cf1087ec33 Added support for writing wave files and specifying filename to write to.
atmosfear
parents: 1038
diff changeset
78
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 799
diff changeset
79 #ifdef HAVE_X11
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 799
diff changeset
80 extern char *mDisplayName;
3655
18cca6a6816c Plugger patch by Sam Lin
atmos4
parents: 3631
diff changeset
81 extern int WinID;
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9314
diff changeset
82 extern int fs_layer;
6303
ad98962908ac Activating/Deactivating of XScreenSaver
arpi
parents: 6209
diff changeset
83 extern int stop_xscreensaver;
8692
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8531
diff changeset
84 extern int vo_x11_keepaspect;
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9314
diff changeset
85 extern char **vo_fstype_list;
10754
2ca1fc045731 Recieving of mouse events can be switched off. Patch by Markus Rechberger <mrechberger@web.de>
alex
parents: 10594
diff changeset
86 extern int vo_nomouse_input;
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 799
diff changeset
87 #endif
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 799
diff changeset
88
1518
e0ceb814471d vo_aa: configurable now
folke
parents: 1501
diff changeset
89 #ifdef HAVE_AA
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
90 extern int vo_aa_parseoption(m_option_t* conf, char *opt, char * param);
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
91 extern void vo_aa_revertoption(m_option_t* opt,char* param);
1518
e0ceb814471d vo_aa: configurable now
folke
parents: 1501
diff changeset
92 #endif
e0ceb814471d vo_aa: configurable now
folke
parents: 1501
diff changeset
93
4213
f1e1b02314ef -zr* added - patch by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 4158
diff changeset
94 #ifdef HAVE_ZR
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
95 extern int vo_zr_parseoption(m_option_t* conf, char *opt, char * param);
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
96 extern void vo_zr_revertoption(m_option_t* opt,char* pram);
4213
f1e1b02314ef -zr* added - patch by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 4158
diff changeset
97 #endif
f1e1b02314ef -zr* added - patch by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 4158
diff changeset
98
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7866
diff changeset
99 #ifdef HAVE_DXR2
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
100 extern m_option_t dxr2_opts[];
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7866
diff changeset
101 #endif
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7866
diff changeset
102
6910
1a747aee653b applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents: 6779
diff changeset
103 #ifdef STREAMING_LIVE_DOT_COM
1a747aee653b applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents: 6779
diff changeset
104 extern int isSDPFile;
7664
b10d6345f2a6 Added support for RTSP stream over TCP.
bertrand
parents: 7614
diff changeset
105 extern int rtspStreamOverTCP;
6910
1a747aee653b applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents: 6779
diff changeset
106 #endif
1a747aee653b applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents: 6779
diff changeset
107
1866
32b1bb50a0e8 some bug fix, and add decoration item to skin conffile. faszom(C)
pontscho
parents: 1709
diff changeset
108 #ifdef HAVE_NEW_GUI
32b1bb50a0e8 some bug fix, and add decoration item to skin conffile. faszom(C)
pontscho
parents: 1709
diff changeset
109 extern char * skinName;
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 8868
diff changeset
110 extern int enqueue;
9314
f38fe55d0e05 this patch adds the option -guiwid to gmplayer. I think its a more clean
arpi
parents: 9291
diff changeset
111 extern int guiWinID;
1866
32b1bb50a0e8 some bug fix, and add decoration item to skin conffile. faszom(C)
pontscho
parents: 1709
diff changeset
112 #endif
32b1bb50a0e8 some bug fix, and add decoration item to skin conffile. faszom(C)
pontscho
parents: 1709
diff changeset
113
2188
1e6ea72b9b87 added -oldpp
arpi
parents: 2178
diff changeset
114 #ifdef HAVE_ODIVX_POSTPROCESS
1e6ea72b9b87 added -oldpp
arpi
parents: 2178
diff changeset
115 extern int use_old_pp;
1e6ea72b9b87 added -oldpp
arpi
parents: 2178
diff changeset
116 #endif
1e6ea72b9b87 added -oldpp
arpi
parents: 2178
diff changeset
117
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3831
diff changeset
118 #ifdef HAVE_XINERAMA
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3831
diff changeset
119 extern int xinerama_screen;
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3831
diff changeset
120 #endif
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3831
diff changeset
121
5055
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 4927
diff changeset
122 #ifdef HAVE_RTC
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 4927
diff changeset
123 extern int nortc;
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 4927
diff changeset
124 #endif
534167719e91 nortc patch by Attila Kinali
atmos4
parents: 4927
diff changeset
125
2053
720ca9249e4e Monitor aspect stuff.
atmos4
parents: 2043
diff changeset
126 /* from libvo/aspect.c */
720ca9249e4e Monitor aspect stuff.
atmos4
parents: 2043
diff changeset
127 extern float monitor_aspect;
720ca9249e4e Monitor aspect stuff.
atmos4
parents: 2043
diff changeset
128
3279
d6ea11bed983 Commandline interface to ao_plugin updated according to mplayers complex parameter format and plugin pl_format finished (alpha code needs testing)
anders
parents: 3275
diff changeset
129 /* Options related to audio out plugins */
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
130 m_option_t ao_plugin_conf[]={
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
131 {"list", &ao_plugin_cfg.plugin_list, CONF_TYPE_STRING, 0, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
132 {"delay", &ao_plugin_cfg.pl_delay_len, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
133 {"format", &ao_plugin_cfg.pl_format_type, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
134 {"fout", &ao_plugin_cfg.pl_resample_fout, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
4859
c72b386debb4 Adding SW volume control
anders
parents: 4788
diff changeset
135 {"volume", &ao_plugin_cfg.pl_volume_volume, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
5306
4b32fe3758fa allow negative mul values
pl
parents: 5224
diff changeset
136 {"mul", &ao_plugin_cfg.pl_extrastereo_mul, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL},
5063
be67d073f23b Added soft clipping for software volume control
anders
parents: 5055
diff changeset
137 {"softclip", &ao_plugin_cfg.pl_volume_softclip, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
138 {NULL, NULL, 0, 0, 0, 0, NULL}
3279
d6ea11bed983 Commandline interface to ao_plugin updated according to mplayers complex parameter format and plugin pl_format finished (alpha code needs testing)
anders
parents: 3275
diff changeset
139 };
d6ea11bed983 Commandline interface to ao_plugin updated according to mplayers complex parameter format and plugin pl_format finished (alpha code needs testing)
anders
parents: 3275
diff changeset
140
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
141 #ifdef HAVE_JPEG
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
142 m_option_t jpeg_conf[]={
8708
47e219bf777d [no]progressiv --> [no]progressive
diego
parents: 8692
diff changeset
143 {"progressive", &jpeg_progressive_mode, CONF_TYPE_FLAG, 0, 0, 1, NULL},
47e219bf777d [no]progressiv --> [no]progressive
diego
parents: 8692
diff changeset
144 {"noprogressive", &jpeg_progressive_mode, CONF_TYPE_FLAG, 0, 1, 0, NULL},
5648
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
145 {"baseline", &jpeg_baseline, CONF_TYPE_FLAG, 0, 0, 1, NULL},
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
146 {"nobaseline", &jpeg_baseline, CONF_TYPE_FLAG, 0, 1, 0, NULL},
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
147 {"optimize", &jpeg_optimize, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
148 {"smooth", &jpeg_smooth, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
149 {"quality", &jpeg_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
150 {"outdir", &jpeg_outdir, CONF_TYPE_STRING, 0, 0, 0, NULL},
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
151 {NULL, NULL, 0, 0, 0, 0, NULL}
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
152 };
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
153 #endif
c3ca8f05b3a9 add jpeg support for libvo
pontscho
parents: 5626
diff changeset
154
3272
7e4399d1eb65 horizontal up/downscale linear & cubic
michael
parents: 3257
diff changeset
155 extern int sws_flags;
3771
a14b3a600b81 new -pp options stuff (-npp ...)
michael
parents: 3754
diff changeset
156 extern int readPPOpt(void *conf, char *arg);
4256
bbaa26821fdf Added reverting support for -aa* -zr* -pp and -npp options
albeu
parents: 4249
diff changeset
157 extern void revertPPOpt(void *conf, char* opt);
8736
michael
parents: 8721
diff changeset
158 extern char* pp_help;
3272
7e4399d1eb65 horizontal up/downscale linear & cubic
michael
parents: 3257
diff changeset
159
1536
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
160 /*
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
161 * CONF_TYPE_FUNC_FULL :
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
162 * allows own implemtations for passing the params
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
163 *
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
164 * the function receives parameter name and argument (if it does not start with - )
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
165 * useful with a conf.name like 'aa*' to parse several parameters to a function
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
166 * return 0 =ok, but we didn't need the param (could be the filename)
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
167 * return 1 =ok, we accepted the param
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
168 * negative values: see cfgparser.h, ERR_XXX
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
169 *
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
170 * by Folke
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
171 */
e89233dab4da New feature for option processing: CONF_TYPE_FUNC_FULL
folke
parents: 1518
diff changeset
172
10594
57bdcdb061d7 Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
alex
parents: 10562
diff changeset
173 m_option_t mplayer_opts[]={
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 457
diff changeset
174 /* name, pointer, type, flags, min, max */
4158
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
175 {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this don't need anymore to be the first!!! */
2616
f96462d7453e common options moved out - for mencoder
arpi
parents: 2557
diff changeset
176
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
177 //---------------------- libao/libvo options ------------------------
458
49b0474b2e26 I really hope that you will learn how to use cvs, sooner or later...
arpi_esp
parents: 457
diff changeset
178 {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
179 CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
7562
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7539
diff changeset
180 {"vo", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
92188b57a062 video out driver list support (like -vc, example: -vo xmga,xv,x11,)
arpi
parents: 7539
diff changeset
181 {"ao", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
10878
501ac934d443 10L -fixed-vo must be a global option
albeu
parents: 10754
diff changeset
182 {"fixed-vo", &fixed_vo, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL},
501ac934d443 10L -fixed-vo must be a global option
albeu
parents: 10754
diff changeset
183 {"nofixed-vo", &fixed_vo, CONF_TYPE_FLAG,CONF_GLOBAL, 0, 0, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
184
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
185 {"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
186 {"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
187 {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
4859
c72b386debb4 Adding SW volume control
anders
parents: 4788
diff changeset
188 {"master", "Option -master has been removed, use -aop list=volume instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
189 // override audio buffer size (used only by -ao oss, anyway obsolete...)
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
190 {"abs", &ao_data.buffersize, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
191
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
192 // -ao pcm options:
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
193 {"aofile", &ao_outputfilename, CONF_TYPE_STRING, 0, 0, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
194 {"waveheader", &ao_pcm_waveheader, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
195 {"nowaveheader", &ao_pcm_waveheader, CONF_TYPE_FLAG, 0, 1, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
196
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
197 {"alsa", "Option -alsa has been removed, new audio code doesn't need it! Remove it from your config file!\n",
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
198 CONF_TYPE_PRINT, 0, 0, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
199 {"noalsa", "Option -noalsa has been removed, new audio code doesn't need it! Remove it from your config file!\n",
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
200 CONF_TYPE_PRINT, 0, 0, 0, NULL},
8531
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8363
diff changeset
201 #ifdef USE_EDL
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8363
diff changeset
202 {"edl", &edl_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8363
diff changeset
203 {"edlout", &edl_output_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8363
diff changeset
204 #else
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8363
diff changeset
205 {"edl", "MPlayer was compiled without EDL support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8363
diff changeset
206 {"edlout", "MPlayer was compiled without EDL support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
1aa2c9b460af Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
arpi
parents: 8363
diff changeset
207 #endif
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
208
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 799
diff changeset
209 #ifdef HAVE_X11
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
210 {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL},
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 799
diff changeset
211 #endif
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
212
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
213 // -vo png only:
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
214 #ifdef HAVE_PNG
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
215 {"z", &z_compression, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
216 #endif
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
217 // -vo jpeg only:
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
218 #ifdef HAVE_JPEG
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
219 {"jpeg", jpeg_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
220 #endif
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
221 // -vo sdl only:
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
222 #ifdef HAVE_SDL
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
223 {"sdl", "Use -vo sdl:driver instead of -vo sdl -sdl driver\n",
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
224 CONF_TYPE_PRINT, 0, 0, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
225 {"noxv", &sdl_noxv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
226 {"forcexv", &sdl_forcexv, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
227 // -ao sdl only:
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
228 {"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver\n",
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
229 CONF_TYPE_PRINT, 0, 0, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
230 #endif
2616
f96462d7453e common options moved out - for mencoder
arpi
parents: 2557
diff changeset
231
7359
7b929a5d753e GTF update: Fixes "known parametrs" even when fbdev unused
arpi
parents: 7069
diff changeset
232 #if defined(HAVE_FBDEV)||defined(HAVE_VESA)
11282
119703388a95 _ ---> - in option names, approved by Alex.
diego
parents: 11216
diff changeset
233 {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
119703388a95 _ ---> - in option names, approved by Alex.
diego
parents: 11216
diff changeset
234 {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
119703388a95 _ ---> - in option names, approved by Alex.
diego
parents: 11216
diff changeset
235 {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
7359
7b929a5d753e GTF update: Fixes "known parametrs" even when fbdev unused
arpi
parents: 7069
diff changeset
236 #endif
7b929a5d753e GTF update: Fixes "known parametrs" even when fbdev unused
arpi
parents: 7069
diff changeset
237
225
62ec84961b27 vo_fbdev added
szabii
parents: 215
diff changeset
238 #ifdef HAVE_FBDEV
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
239 {"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
240 {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
241 {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0, NULL},
3275
38344371432f vo DirectFB support by Jiri Svoboda <Jiri.Svoboda@seznam.cz>
arpi
parents: 3272
diff changeset
242 #else
38344371432f vo DirectFB support by Jiri Svoboda <Jiri.Svoboda@seznam.cz>
arpi
parents: 3272
diff changeset
243 #ifdef HAVE_DIRECTFB
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
244 {"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
3275
38344371432f vo DirectFB support by Jiri Svoboda <Jiri.Svoboda@seznam.cz>
arpi
parents: 3272
diff changeset
245 #endif
225
62ec84961b27 vo_fbdev added
szabii
parents: 215
diff changeset
246 #endif
8137
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
247 #ifdef HAVE_DIRECTFB
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
248 #if DIRECTFBVERSION > 912
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
249 {"dfbopts", &dfb_params, CONF_TYPE_STRING, 0, 0, 0, NULL},
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
250 #endif
530d1c5f0c78 Switch containing options for DirectFB library was renamed to dfbopts.
arpi
parents: 8028
diff changeset
251 #endif
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
252
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
253 // force window width/height or resolution (with -vm)
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
254 {"x", &opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
255 {"y", &opt_screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
256 // set screen dimensions (when not detectable or virtual!=visible)
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8137
diff changeset
257 {"screenw", &vo_screenwidth, CONF_TYPE_INT, CONF_RANGE|CONF_OLD, 0, 4096, NULL},
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 8137
diff changeset
258 {"screenh", &vo_screenheight, CONF_TYPE_INT, CONF_RANGE|CONF_OLD, 0, 4096, NULL},
7866
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents: 7864
diff changeset
259 // Geometry string
732a8bfc7681 Added the -geometry option (supports fbdev and tdfxfb drivers)
mark
parents: 7864
diff changeset
260 {"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
261 // set aspect ratio of monitor - usefull for 16:9 TVout
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
262 {"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
263 // video mode switching: (x11,xv,dga)
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
264 {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
265 {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
266 // start in fullscreen mode:
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
267 {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
268 {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
269 // set fullscreen switch method (workaround for buggy WMs)
9339
64c93eab2c43 add newline
nexus
parents: 9336
diff changeset
270 {"fsmode", "option 'fsmode' is obsolete, avoid using it! if you really want it, try -fsmode-dontuse, but don't report bugs with this option used!\n", CONF_TYPE_PRINT, CONF_RANGE, 0, 31, NULL},
6065
1d792986b2a5 -fsmode accept 0..31 now
arpi
parents: 6021
diff changeset
271 {"fsmode-dontuse", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
272 // set bpp (x11+vm, dga, fbdev, vesa, svga?)
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
273 {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL},
10988
c2bff70784d5 user settable colorkey
alex
parents: 10917
diff changeset
274 {"colorkey", &vo_colorkey, CONF_TYPE_INT, 0, 0, 0, NULL},
11216
30eccb0d1a64 fixed -nocolorkey
alex
parents: 11158
diff changeset
275 {"nocolorkey", &vo_colorkey, CONF_TYPE_FLAG, 0, 0, 0x1000000, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
276 // double buffering: (mga/xmga, xv, vidix, vesa, fbdev)
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
277 {"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
278 {"nodouble", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 1, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
279 // wait for v-sync (vesa)
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
280 {"vsync", &vo_vsync, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
281 {"novsync", &vo_vsync, CONF_TYPE_FLAG, 0, 1, 0, NULL},
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6303
diff changeset
282 {"panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
283
7539
56ea9db91251 -nograbpointer, based on old patch by Christian Ohm <chr.ohm@gmx.net>
arpi
parents: 7495
diff changeset
284 {"grabpointer", &vo_grabpointer, CONF_TYPE_FLAG, 0, 0, 1, NULL},
56ea9db91251 -nograbpointer, based on old patch by Christian Ohm <chr.ohm@gmx.net>
arpi
parents: 7495
diff changeset
285 {"nograbpointer", &vo_grabpointer, CONF_TYPE_FLAG, 0, 1, 0, NULL},
56ea9db91251 -nograbpointer, based on old patch by Christian Ohm <chr.ohm@gmx.net>
arpi
parents: 7495
diff changeset
286
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
287 #ifdef HAVE_X11
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
288 // x11,xv,xmga,xvidix
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
289 {"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
290 {"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL},
9317
c7f5df43b937 - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
filon
parents: 9314
diff changeset
291 {"icelayer", "Use -fstype layer:<number> instead. -icelayer was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
11282
119703388a95 _ ---> - in option names, approved by Alex.
diego
parents: 11216
diff changeset
292 {"stop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL},
119703388a95 _ ---> - in option names, approved by Alex.
diego
parents: 11216
diff changeset
293 {"nostop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL},
119703388a95 _ ---> - in option names, approved by Alex.
diego
parents: 11216
diff changeset
294 {"stop_xscreensaver", "Use -stop-xscreensaver instead, options with _ have been obsoleted.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
8692
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8531
diff changeset
295 {"keepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL},
604f0cde816c X11 window aspect patch by Arnaud Boulan <boulan@iie.cnam.fr>
attila
parents: 8531
diff changeset
296 {"nokeepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 1, 0, NULL},
9336
4d39aa85a723 Forgot about #ifdef HAVE_X11. 10l
filon
parents: 9317
diff changeset
297 {"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
10754
2ca1fc045731 Recieving of mouse events can be switched off. Patch by Markus Rechberger <mrechberger@web.de>
alex
parents: 10594
diff changeset
298 {"nomouseinput", &vo_nomouse_input, CONF_TYPE_FLAG,0,0,-1,NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
299 #endif
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
300
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
301 #ifdef HAVE_XINERAMA
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
302 {"xineramascreen", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
303 #endif
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
304
6779
c5e08b7c048c eq handling reworked
alex
parents: 6671
diff changeset
305 {"brightness",&vo_gamma_brightness, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
c5e08b7c048c eq handling reworked
alex
parents: 6671
diff changeset
306 {"saturation",&vo_gamma_saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
c5e08b7c048c eq handling reworked
alex
parents: 6671
diff changeset
307 {"contrast",&vo_gamma_contrast, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
c5e08b7c048c eq handling reworked
alex
parents: 6671
diff changeset
308 {"hue",&vo_gamma_hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
309
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
310 // direct rendering (decoding to video out buffer)
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
311 {"dr", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
312 {"nodr", &vo_directrendering, CONF_TYPE_FLAG, 0, 1, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
313 {"vaa_dr", "Use -dr, -vaa_dr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
314 {"vaa_nodr", "Use -nodr, -vaa_nodr was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
315
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
316 #ifdef HAVE_AA
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
317 // -vo aa
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
318 {"aa*", vo_aa_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0 , &vo_aa_revertoption},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
319 #endif
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
320
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
321 #ifdef HAVE_ZR
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
322 // -vo zr
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
323 {"zr*", vo_zr_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0, &vo_zr_revertoption },
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
324 #endif
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
325
7867
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7866
diff changeset
326 #ifdef HAVE_DXR2
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7866
diff changeset
327 {"dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7866
diff changeset
328 #endif
3dc0b71630ff cleanup config option handling in libmpdemux.
arpi
parents: 7866
diff changeset
329
6910
1a747aee653b applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents: 6779
diff changeset
330 #ifdef STREAMING_LIVE_DOT_COM
9877
55a284809828 Added a \n to the msg about -sdp being deprecated
rsf
parents: 9796
diff changeset
331 {"sdp", "-sdp is deprecated, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
7664
b10d6345f2a6 Added support for RTSP stream over TCP.
bertrand
parents: 7614
diff changeset
332 // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP
b10d6345f2a6 Added support for RTSP stream over TCP.
bertrand
parents: 7614
diff changeset
333 {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL},
6910
1a747aee653b applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents: 6779
diff changeset
334 #else
7664
b10d6345f2a6 Added support for RTSP stream over TCP.
bertrand
parents: 7614
diff changeset
335 {"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE.COM Streaming Media\" libraries!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
6910
1a747aee653b applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents: 6779
diff changeset
336 #endif
1a747aee653b applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents: 6779
diff changeset
337
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
338 //---------------------- mplayer-only options ------------------------
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
339
8721
97a1afe2d615 osdlevel can have the value of 3 too
alex
parents: 8708
diff changeset
340 {"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
8198
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
341 #ifdef HAVE_MENU
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
342 {"menu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
343 {"nomenu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
344 {"menu-root", &menu_root, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
345 {"menu-cfg", &menu_cfg, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
346 #else
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
347 {"menu", "OSD menu support was not compiled in\n", CONF_TYPE_PRINT,0, 0, 0, NULL},
1935017c0f71 Experimantal OSD menu
albeu
parents: 8164
diff changeset
348 #endif
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
349
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
350 // these should be moved to -common, and suppot in mencoder too
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
351 {"vobsub", &vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
352 {"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
10917
d45870f67728 Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
attila
parents: 10878
diff changeset
353 {"forcedsubsonly", &forced_subs_only,CONF_TYPE_FLAG, 0, 0, 1, NULL},
5669
391931fa79a6 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
arpi
parents: 5648
diff changeset
354
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
355 {"sstep", &step_sec, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
1211
e21c61b2313e alsa/noalsa message
arpi_esp
parents: 1187
diff changeset
356
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
357 // set a-v distance, should be moved to -common and support in mencoder
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
358 {"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -100.0, 100.0, NULL},
1211
e21c61b2313e alsa/noalsa message
arpi_esp
parents: 1187
diff changeset
359
7605
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
360 {"speed", &playback_speed, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, NULL},
c3bbe602aff3 new option -speed, to set playback speed rate (examples: -speed 1:3 or -speed 5)
arpi
parents: 7604
diff changeset
361
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
362 {"framedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 0, 1, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
363 {"hardframedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 0, 2, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
364 {"noframedrop", &frame_dropping, CONF_TYPE_FLAG, 0, 1, 0, NULL},
1124
0e95f30ffd4c -frames and -benchmark options to make chl & gabucino happy
arpi_esp
parents: 1112
diff changeset
365
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
366 {"autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
2616
f96462d7453e common options moved out - for mencoder
arpi
parents: 2557
diff changeset
367
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
368 {"benchmark", &benchmark, CONF_TYPE_FLAG, 0, 0, 1, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
369
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
370 // dump some stream out instead of playing the file
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
371 // this really should be in mencoder instead of mplayer... -> TODO
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
372 {"dumpfile", &stream_dump_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
373 {"dumpaudio", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 1, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
374 {"dumpvideo", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 2, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
375 {"dumpsub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 3, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
376 {"dumpmpsub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 4, NULL},
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
377 {"dumpstream", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 5, NULL},
6209
e46b3bf16df5 added -dumpsrtsub option for SubRip format
iive
parents: 6202
diff changeset
378 {"dumpsrtsub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 6, NULL},
7460
fdf31bb0450f New option for mplayer: -dumpmicrodvdsub
kmkaplan
parents: 7451
diff changeset
379 {"dumpmicrodvdsub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 7, NULL},
8360
ad75993b8deb dump in JACOsub format
arpi
parents: 8198
diff changeset
380 {"dumpjacosub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 8, NULL},
8363
ae74be3e2ed0 dump subtitles in SAMI format
arpi
parents: 8360
diff changeset
381 {"dumpsami", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 9, NULL},
2178
e509abdbf195 MPsub read/write support 0.5 (-dumpmpsub switch)
laaz
parents: 2151
diff changeset
382
1149
6a0f937b52e6 - new config option -lircconfig (config file for lirc)
acki2
parents: 1124
diff changeset
383 #ifdef HAVE_LIRC
7946
f483ab704252 postprocessing cleanup:
michael
parents: 7867
diff changeset
384 {"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
1149
6a0f937b52e6 - new config option -lircconfig (config file for lirc)
acki2
parents: 1124
diff changeset
385 #endif
1518
e0ceb814471d vo_aa: configurable now
folke
parents: 1501
diff changeset
386
7019
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 6910
diff changeset
387 {"gui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCMD, 0, 1, NULL},
e37a67d5e117 fix (?) cmd line handling
pontscho
parents: 6910
diff changeset
388 // {"nogui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
1518
e0ceb814471d vo_aa: configurable now
folke
parents: 1501
diff changeset
389
1866
32b1bb50a0e8 some bug fix, and add decoration item to skin conffile. faszom(C)
pontscho
parents: 1709
diff changeset
390 #ifdef HAVE_NEW_GUI
4158
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
391 {"skin", &skinName, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
9291
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 8868
diff changeset
392 {"enqueue", &enqueue, CONF_TYPE_FLAG, 0, 0, 1, NULL},
64b8c5a07c2c - It adds an option enqueue/noenqueue, so users can choose if they want to
arpi
parents: 8868
diff changeset
393 {"noenqueue", &enqueue, CONF_TYPE_FLAG, 0, 0, 0, NULL},
9314
f38fe55d0e05 this patch adds the option -guiwid to gmplayer. I think its a more clean
arpi
parents: 9291
diff changeset
394 {"guiwid", &guiWinID, CONF_TYPE_INT, 0, 0, 0, NULL},
1866
32b1bb50a0e8 some bug fix, and add decoration item to skin conffile. faszom(C)
pontscho
parents: 1709
diff changeset
395 #endif
2616
f96462d7453e common options moved out - for mencoder
arpi
parents: 2557
diff changeset
396
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
397 {"noloop", &loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
398 {"loop", &loop_times, CONF_TYPE_INT, CONF_RANGE, -1, 10000, NULL},
4158
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
399 {"playlist", NULL, CONF_TYPE_STRING, 0, 0, 0, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
400
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
401 // a-v sync stuff:
7576
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7562
diff changeset
402 {"noautosync", &autosync, CONF_TYPE_FLAG, 0, 0, -1, NULL},
c135f7646036 new opt: -autosync, controls ao->get_delay() smoothing (default: disabled)
arpi
parents: 7562
diff changeset
403 {"autosync", &autosync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL},
7495
12b2c735ad07 removed -dapsync (obsolete code)
arpi
parents: 7460
diff changeset
404 // {"dapsync", &dapsync, CONF_TYPE_FLAG, 0, 0, 1, NULL},
12b2c735ad07 removed -dapsync (obsolete code)
arpi
parents: 7460
diff changeset
405 // {"nodapsync", &dapsync, CONF_TYPE_FLAG, 0, 1, 0, NULL},
12b2c735ad07 removed -dapsync (obsolete code)
arpi
parents: 7460
diff changeset
406
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
407 {"softsleep", &softsleep, CONF_TYPE_FLAG, 0, 0, 1, NULL},
5974
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
408 #ifdef HAVE_RTC
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
409 {"nortc", &nortc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
4396ead317d3 re-ordering options, add comemnts
arpi
parents: 5904
diff changeset
410 #endif
2889
0d8553a47d1a RTC support, softsleep and optional new timing code by Dap
arpi
parents: 2790
diff changeset
411
4158
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
412 {"slave", &slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL},
4891
30798db9527f New option use-stdin
albeu
parents: 4859
diff changeset
413 {"use-stdin", &use_stdin, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
3831
9926017e5efd -rootwin option (x11/xv only, x11 doesn't work for me)
arpi
parents: 3771
diff changeset
414
2790
98769cea155c added tv subsystem
alex
parents: 2647
diff changeset
415 #define MAIN_CONF
2616
f96462d7453e common options moved out - for mencoder
arpi
parents: 2557
diff changeset
416 #include "cfg-common.h"
2790
98769cea155c added tv subsystem
alex
parents: 2647
diff changeset
417 #undef MAIN_CONF
565
6e747808386e changed behavior or -idx/-noidx
arpi_esp
parents: 552
diff changeset
418
7864
dacc35bc92c7 add -identify switch
ranma
parents: 7677
diff changeset
419 {"identify", &identify, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
4158
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
420 {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
4446
d2808c58e633 added -noquiet option to complement -quiet (request/patch by Alexander Werth)
rfelker
parents: 4355
diff changeset
421 {"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
8028
c06fa0b05c1c -really-quiet
arpi
parents: 7998
diff changeset
422 {"really-quiet", &verbose, CONF_TYPE_FLAG, CONF_GLOBAL, 0, -10, NULL},
4158
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
423 {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL},
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
424 {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL},
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
425 {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
426 {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
479c7828edbb GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4157
diff changeset
427 {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
4157
9ff9f6ce6799 extra NULL field appended
arpi
parents: 4080
diff changeset
428 {NULL, NULL, 0, 0, 0, 0, NULL}
147
0a0d7dd8fb51 new command line/config file parser
szabii
parents:
diff changeset
429 };