mirror of
https://github.com/mpv-player/mpv
synced 2024-09-20 20:46:26 +02:00
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
This commit is contained in:
parent
b7beba3003
commit
74b35b3fc7
@ -27,13 +27,16 @@
|
|||||||
{"vcd", "-vcd N is deprecated, use vcd://N instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL},
|
{"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},
|
{"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},
|
{"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},
|
{"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},
|
{"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},
|
{"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
|
||||||
{"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL},
|
{"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL},
|
||||||
#else
|
#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},
|
{"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
|
||||||
#endif
|
#endif
|
||||||
{"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
|
{"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
|
||||||
|
Loading…
Reference in New Issue
Block a user