Mercurial > mplayer.hg
changeset 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 | 59d10ceb72c8 |
| children | 16990c298b7b |
| files | cfg-common.h |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Thu Jul 13 21:22:56 2006 +0000 +++ b/cfg-common.h Thu Jul 13 21:40:14 2006 +0000 @@ -27,13 +27,16 @@ {"vcd", "-vcd N is deprecated, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL}, {"cuefile", "-cuefile is deprecated, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#if defined(USE_DVDREAD) || defined(USE_DVDNAV) + {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#else + {"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, +#endif #ifdef USE_DVDREAD - {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"dvd", "-dvd N is deprecated, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, #else - {"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},