diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-13 21:40:14 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-13 21:40:14 +0000 |
| commit | 74b35b3fc7b80c1f0be09b90a892b928b9764040 (patch) | |
| tree | 9ab3af803a6ef91b9aca491c28e09c935d1be527 /cfg-common.h | |
| parent | b7beba300376250bf9fcb6c6a5f233adb4341451 (diff) | |
| download | mpv-74b35b3fc7b80c1f0be09b90a892b928b9764040.tar.bz2 mpv-74b35b3fc7b80c1f0be09b90a892b928b9764040.tar.xz | |
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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19074 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cfg-common.h b/cfg-common.h index 1c7008b5bc..c863f4cc47 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -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}, -#ifdef USE_DVDREAD +#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", "-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}, |