Mercurial > mplayer.hg
comparison cfg-common.h @ 12407:574b1ed2f9a3
spelling, wording, consistency in comments and printed messages
author | diego |
---|---|
date | Mon, 03 May 2004 10:09:18 +0000 |
parents | 67b8d64af8c7 |
children | ad1a2bad9248 |
comparison
equal
deleted
inserted
replaced
12406:e946216a94ad | 12407:574b1ed2f9a3 |
---|---|
11 | 11 |
12 #ifdef USE_STREAM_CACHE | 12 #ifdef USE_STREAM_CACHE |
13 {"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL}, | 13 {"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL}, |
14 {"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL}, | 14 {"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL}, |
15 #else | 15 #else |
16 {"cache", "MPlayer was compiled WITHOUT cache2 support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 16 {"cache", "MPlayer was compiled without cache2 support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
17 #endif | 17 #endif |
18 {"vcd", "-vcd N is deprecated, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL}, | 18 {"vcd", "-vcd N is deprecated, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL}, |
19 {"cuefile", "-cuefile is deprecated, use cue://filname:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, | 19 {"cuefile", "-cuefile is deprecated, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
20 {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 20 {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
21 #ifdef USE_DVDNAV | 21 #ifdef USE_DVDNAV |
22 {"dvdnav", "-dvdnav deprecated, use dvdnav:// instead.\n", CONF_TYPE_PRINT, 0, 0, 1, NULL}, | 22 {"dvdnav", "-dvdnav is deprecated, use dvdnav:// instead.\n", CONF_TYPE_PRINT, 0, 0, 1, NULL}, |
23 {"skipopening", &dvd_nav_skip_opening, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 23 {"skipopening", &dvd_nav_skip_opening, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
24 {"noskipopening", &dvd_nav_skip_opening, CONF_TYPE_FLAG, 0, 1, 0, NULL}, | 24 {"noskipopening", &dvd_nav_skip_opening, CONF_TYPE_FLAG, 0, 1, 0, NULL}, |
25 #endif | 25 #endif |
26 #ifdef USE_DVDREAD | 26 #ifdef USE_DVDREAD |
27 {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 27 {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
28 {"dvd", "-dvd N is deprecated, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL}, | 28 {"dvd", "-dvd N is deprecated, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
29 {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, | 29 {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, |
30 {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, | 30 {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, |
31 {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 31 {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
32 #else | 32 #else |
33 {"dvd", "MPlayer was compiled WITHOUT libdvdread support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 33 {"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
34 #endif | 34 #endif |
35 {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 35 {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
36 | 36 |
37 {"dvdauth", "libcss support is OBSOLETED! RTFM!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 37 {"dvdauth", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
38 {"dvdkey", "libcss support is OBSOLETED! RTFM!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 38 {"dvdkey", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
39 {"csslib", "libcss support is OBSOLETED! RTFM!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 39 {"csslib", "libcss support is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
40 | 40 |
41 #ifdef MPLAYER_NETWORK | 41 #ifdef MPLAYER_NETWORK |
42 {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 42 {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
43 {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 43 {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
44 {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, | 44 {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, |
49 {"prefer-ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 49 {"prefer-ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
50 {"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 50 {"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
51 #ifdef HAVE_AF_INET6 | 51 #ifdef HAVE_AF_INET6 |
52 {"prefer-ipv6", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 1, 0, NULL}, | 52 {"prefer-ipv6", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 1, 0, NULL}, |
53 #else | 53 #else |
54 {"prefer-ipv6", "MPlayer was compiled WITHOUT IPv6 support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, | 54 {"prefer-ipv6", "MPlayer was compiled without IPv6 support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
55 #endif | 55 #endif |
56 | 56 |
57 #else | 57 #else |
58 {"user", "MPlayer was compiled WITHOUT streaming(network) support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 58 {"user", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
59 {"passwd", "MPlayer was compiled WITHOUT streaming(network) support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 59 {"passwd", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
60 {"bandwidth", "MPlayer was compiled WITHOUT streaming(network) support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 60 {"bandwidth", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
61 {"user-agent", "MPlayer was compiled WITHOUT streaming(network) support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 61 {"user-agent", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
62 #endif | 62 #endif |
63 | 63 |
64 | 64 |
65 // ------------------------- demuxer options -------------------- | 65 // ------------------------- demuxer options -------------------- |
66 | 66 |
73 | 73 |
74 // AVI specific: force non-interleaved mode | 74 // AVI specific: force non-interleaved mode |
75 {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 75 {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
76 {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL}, | 76 {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL}, |
77 | 77 |
78 // AVI and OGG only: (re)build index at startup | 78 // AVI and Ogg only: (re)build index at startup |
79 {"noidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 0, NULL}, | 79 {"noidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 0, NULL}, |
80 {"idx", &index_mode, CONF_TYPE_FLAG, 0, -1, 1, NULL}, | 80 {"idx", &index_mode, CONF_TYPE_FLAG, 0, -1, 1, NULL}, |
81 {"forceidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 2, NULL}, | 81 {"forceidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 2, NULL}, |
82 {"saveidx", &index_file_save, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 82 {"saveidx", &index_file_save, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
83 {"loadidx", &index_file_load, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 83 {"loadidx", &index_file_load, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
84 | 84 |
85 // select audio/videosubtitle stream | 85 // select audio/video subtitle stream |
86 {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL}, | 86 {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL}, |
87 {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL}, | 87 {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL}, |
88 {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL}, | 88 {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL}, |
89 {"novideo", &video_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, | 89 {"novideo", &video_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, |
90 | 90 |
110 | 110 |
111 {"mf", mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL}, | 111 {"mf", mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL}, |
112 #ifdef USE_TV | 112 #ifdef USE_TV |
113 {"tv", tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 113 {"tv", tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
114 #else | 114 #else |
115 {"tv", "MPlayer was compiled without TV Interface support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, | 115 {"tv", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
116 #endif | 116 #endif |
117 {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 117 {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
118 #ifdef HAS_DVBIN_SUPPORT | 118 #ifdef HAS_DVBIN_SUPPORT |
119 {"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 119 {"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
120 #endif | 120 #endif |
161 // {"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 161 // {"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
162 {"ac", &audio_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, | 162 {"ac", &audio_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, |
163 {"vc", &video_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, | 163 {"vc", &video_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, |
164 | 164 |
165 // postprocessing: | 165 // postprocessing: |
166 {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n", | 166 {"divxq", "-divxq has been renamed to -pp (postprocessing), use -pp.\n", |
167 CONF_TYPE_PRINT, 0, 0, 0, NULL}, | 167 CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
168 #ifdef USE_LIBAVCODEC | 168 #ifdef USE_LIBAVCODEC |
169 {"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL}, | 169 {"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL}, |
170 #endif | 170 #endif |
171 #ifdef HAVE_ODIVX_POSTPROCESS | 171 #ifdef HAVE_ODIVX_POSTPROCESS |
172 {"oldpp", &use_old_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 172 {"oldpp", &use_old_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
173 #else | 173 #else |
174 {"oldpp", "MPlayer was compiled without opendivx library\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 174 {"oldpp", "MPlayer was compiled without the OpenDivX library.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
175 #endif | 175 #endif |
176 {"npp", "-npp has been removed, use -vf pp and read the fine manual.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 176 {"npp", "-npp has been removed, use -vf pp and read the fine manual.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
177 #ifdef FF_POSTPROCESS | 177 #ifdef FF_POSTPROCESS |
178 {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL}, | 178 {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL}, |
179 #endif | 179 #endif |
187 {"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL}, | 187 {"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL}, |
188 {"xy", &screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0.001, 4096, NULL}, | 188 {"xy", &screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0.001, 4096, NULL}, |
189 | 189 |
190 {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, | 190 {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, |
191 {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, | 191 {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, |
192 {"tsfastparse", "-tsfastparse isn't a valid option anymore.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL | 192 {"tsfastparse", "-tsfastparse is not a valid option anymore.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL |
193 }, | 193 }, |
194 {"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL}, | 194 {"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL}, |
195 #define TS_MAX_PROBE_SIZE 2000000 /* dont forget to change this in libmpdemux/demux_ts.c too */ | 195 #define TS_MAX_PROBE_SIZE 2000000 /* don't forget to change this in libmpdemux/demux_ts.c too */ |
196 {"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, | 196 {"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, |
197 {"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 197 {"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
198 | 198 |
199 // draw by slices or whole frame (useful with libmpeg2/libavcodec) | 199 // draw by slices or whole frame (useful with libmpeg2/libavcodec) |
200 {"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 200 {"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
214 #ifdef USE_FRIBIDI | 214 #ifdef USE_FRIBIDI |
215 {"fribidi-charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 215 {"fribidi-charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
216 {"flip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 216 {"flip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
217 {"noflip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL}, | 217 {"noflip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL}, |
218 #else | 218 #else |
219 {"fribidi-charset", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 219 {"fribidi-charset", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
220 {"flip-hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 220 {"flip-hebrew", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
221 {"noflip-hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 221 {"noflip-hebrew", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
222 #endif | 222 #endif |
223 #ifdef USE_ICONV | 223 #ifdef USE_ICONV |
224 {"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 224 {"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
225 #endif | 225 #endif |
226 {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, | 226 {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, |
263 #endif | 263 #endif |
264 #ifdef HAVE_FONTCONFIG | 264 #ifdef HAVE_FONTCONFIG |
265 {"fontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 265 {"fontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
266 {"nofontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, 1, 0, NULL}, | 266 {"nofontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, 1, 0, NULL}, |
267 #else | 267 #else |
268 {"fontconfig", "MPlayer wasn't compiled with Fontconfig support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 268 {"fontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
269 {"nofontconfig", "MPlayer wasn't compiled with Fontconfig support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 269 {"nofontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
270 #endif | 270 #endif |
271 #endif | 271 #endif |
272 | 272 |
273 #else | 273 #else |
274 | 274 |
275 #include "config.h" | 275 #include "config.h" |
276 | 276 |
277 extern int quiet; | 277 extern int quiet; |
278 extern int verbose; | 278 extern int verbose; |
279 | 279 |
280 // codec/filter opts: (defiend at libmpcodecs/vd.c) | 280 // codec/filter opts: (defined at libmpcodecs/vd.c) |
281 extern float screen_size_xy; | 281 extern float screen_size_xy; |
282 extern float movie_aspect; | 282 extern float movie_aspect; |
283 extern int softzoom; | 283 extern int softzoom; |
284 extern int flip; | 284 extern int flip; |
285 extern int vd_use_slices; | 285 extern int vd_use_slices; |
286 extern int divx_quality; | 286 extern int divx_quality; |
287 | 287 |
288 /* defined in codec-cfg.c */ | 288 /* defined in codec-cfg.c */ |
289 extern char * codecs_file; | 289 extern char * codecs_file; |
290 | 290 |
291 /* from dec_audio, currently used for ac3surround decoder only */ | 291 /* from dec_audio, currently used for AC3 surround decoder only */ |
292 extern int audio_output_channels; | 292 extern int audio_output_channels; |
293 | 293 |
294 #ifdef MPLAYER_NETWORK | 294 #ifdef MPLAYER_NETWORK |
295 /* defined in network.c */ | 295 /* defined in network.c */ |
296 extern char *network_username; | 296 extern char *network_username; |
327 extern char* edl_output_filename; | 327 extern char* edl_output_filename; |
328 #endif | 328 #endif |
329 | 329 |
330 #ifdef USE_TV | 330 #ifdef USE_TV |
331 m_option_t tvopts_conf[]={ | 331 m_option_t tvopts_conf[]={ |
332 {"on", "-tv on is deprecated, use tv:// instead\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, | 332 {"on", "-tv on is deprecated, use tv:// instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
333 {"immediatemode", &tv_param_immediate, CONF_TYPE_FLAG, 0, 0, 0, NULL}, | 333 {"immediatemode", &tv_param_immediate, CONF_TYPE_FLAG, 0, 0, 0, NULL}, |
334 {"noaudio", &tv_param_noaudio, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 334 {"noaudio", &tv_param_noaudio, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
335 {"audiorate", &tv_param_audiorate, CONF_TYPE_INT, 0, 0, 0, NULL}, | 335 {"audiorate", &tv_param_audiorate, CONF_TYPE_INT, 0, 0, 0, NULL}, |
336 {"driver", &tv_param_driver, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 336 {"driver", &tv_param_driver, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
337 {"device", &tv_param_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 337 {"device", &tv_param_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
435 extern char * mf_type; | 435 extern char * mf_type; |
436 extern m_obj_settings_t* vf_settings; | 436 extern m_obj_settings_t* vf_settings; |
437 extern m_obj_list_t vf_obj_list; | 437 extern m_obj_list_t vf_obj_list; |
438 | 438 |
439 m_option_t mfopts_conf[]={ | 439 m_option_t mfopts_conf[]={ |
440 {"on", "-mf on is deprecated, use mf://files instead\n", CONF_TYPE_PRINT, 0, 0, 1, NULL}, | 440 {"on", "-mf on is deprecated, use mf:// instead.\n", CONF_TYPE_PRINT, 0, 0, 1, NULL}, |
441 {"w", &mf_w, CONF_TYPE_INT, 0, 0, 0, NULL}, | 441 {"w", &mf_w, CONF_TYPE_INT, 0, 0, 0, NULL}, |
442 {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL}, | 442 {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL}, |
443 {"fps", &mf_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL}, | 443 {"fps", &mf_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL}, |
444 {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 444 {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
445 {NULL, NULL, 0, 0, 0, 0, NULL} | 445 {NULL, NULL, 0, 0, 0, 0, NULL} |