Mercurial > mplayer.hg

comparison stream/stream_dvb.c @ 33259:04dc3e55cd90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Increase the maximum value of the DVB timeout to 240 seconds. Some devices may need more time for the initial tune (e.g. firmware loading). Let the user specify higher timeout value if there is need to. The default remains 30 seconds.
author iive
date Sun, 01 May 2011 18:07:59 +0000
parents b39155e98ac3
children a93891202051
comparison
equal deleted inserted replaced
33258:6170442680ac 33259:04dc3e55cd90
74 74
75 /// URL definition 75 /// URL definition
76 static const m_option_t stream_params[] = { 76 static const m_option_t stream_params[] = {
77 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL}, 77 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL},
78 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, 78 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
79 {"timeout",ST_OFF(timeout), CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL}, 79 {"timeout",ST_OFF(timeout), CONF_TYPE_INT, M_OPT_RANGE, 1, 240, NULL},
80 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL}, 80 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL},
81 81
82 {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL }, 82 {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL },
83 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, 83 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
84 {NULL, NULL, 0, 0, 0, 0, NULL} 84 {NULL, NULL, 0, 0, 0, 0, NULL}
94 94
95 95
96 const m_option_t dvbin_opts_conf[] = { 96 const m_option_t dvbin_opts_conf[] = {
97 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL}, 97 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL},
98 {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, 98 {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
99 {"timeout", &stream_defaults.timeout, CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL}, 99 {"timeout", &stream_defaults.timeout, CONF_TYPE_INT, M_OPT_RANGE, 1, 240, NULL},
100 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL}, 100 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL},
101 101
102 {NULL, NULL, 0, 0, 0, 0, NULL} 102 {NULL, NULL, 0, 0, 0, 0, NULL}
103 }; 103 };
104 104