Mercurial > mplayer.hg

comparison cfg-common.h @ 22999:499526183645

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge both USE_DVDREAD sections.
author diego
date Wed, 18 Apr 2007 09:58:04 +0000
parents 85343b921fef
children 1de2a46a0987
comparison
equal deleted inserted replaced
22998:85343b921fef 22999:499526183645
28 {"cuefile", "-cuefile has been removed, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, 28 {"cuefile", "-cuefile has been removed, 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 #ifdef USE_DVDREAD 30 #ifdef USE_DVDREAD
31 {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, 31 {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
32 {"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL}, 32 {"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL},
33 #else
34 {"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
35 {"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
36 #endif
37 #ifdef USE_DVDREAD
38 {"dvd", "-dvd N has been removed, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL}, 33 {"dvd", "-dvd N has been removed, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL},
39 {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, 34 {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
40 {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, 35 {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL},
41 #else 36 #else
37 {"dvd-device", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
38 {"dvd-speed", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
42 {"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, 39 {"dvd", "MPlayer was compiled without libdvdread support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
43 #endif 40 #endif
44 {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, 41 {"alang", &audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
45 {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, 42 {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
46 43