Mercurial > mplayer.hg
comparison cfg-common.h @ 19069:94b9bda83a74
dvd-device should also be enabled when dvdnav_stream is requested but stream_dvd
is not (USE_DVDNAV && !USE_DVDREAD), since it is a valid configuration and there
is no way of selecting the dvd device otherwise.
patch by Emanuele Giaquinta, emanuele giaquinta at gmail com
| author | diego |
|---|---|
| date | Thu, 13 Jul 2006 21:40:14 +0000 |
| parents | 73b8f5ff772d |
| children | a2f20562aac3 |
comparison
equal
deleted
inserted
replaced
| 19068:59d10ceb72c8 | 19069:94b9bda83a74 |
|---|---|
| 25 {"cache", "MPlayer was compiled without cache2 support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 25 {"cache", "MPlayer was compiled without cache2 support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
| 26 #endif | 26 #endif |
| 27 {"vcd", "-vcd N is deprecated, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL}, | 27 {"vcd", "-vcd N is deprecated, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL}, |
| 28 {"cuefile", "-cuefile is deprecated, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, | 28 {"cuefile", "-cuefile is deprecated, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
| 29 {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 29 {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
| 30 #if defined(USE_DVDREAD) || defined(USE_DVDNAV) | |
| 31 {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
| 32 #else | |
| 33 {"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | |
| 34 #endif | |
| 30 #ifdef USE_DVDREAD | 35 #ifdef USE_DVDREAD |
| 31 {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
| 32 {"dvd", "-dvd N is deprecated, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL}, | 36 {"dvd", "-dvd N is deprecated, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
| 33 {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, | 37 {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, |
| 34 {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, | 38 {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, |
| 35 #else | 39 #else |
| 36 {"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | |
| 37 {"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, | 40 {"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
| 38 #endif | 41 #endif |
| 39 {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 42 {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
| 40 {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 43 {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
| 41 | 44 |