Mercurial > mplayer.hg
changeset 26391:16ab100f5870
removed useless parameter :type from -dvbin (the frontend type is reported by the card)
| author | nicodvb |
|---|---|
| date | Sat, 12 Apr 2008 20:36:57 +0000 |
| parents | b2cc442c095d |
| children | f41b913170ea |
| files | stream/stream_dvb.c |
| diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/stream_dvb.c Sat Apr 12 20:30:36 2008 +0000 +++ b/stream/stream_dvb.c Sat Apr 12 20:36:57 2008 +0000 @@ -62,13 +62,12 @@ { char *prog; int card; - char *type; int timeout; char *file; } stream_defaults = { - "", 1, "", 30, NULL + "", 1, 30, NULL }; #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f) @@ -77,7 +76,6 @@ static const m_option_t stream_params[] = { {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, - {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"timeout",ST_OFF(timeout), CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL}, {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL}, @@ -98,7 +96,6 @@ const m_option_t dvbin_opts_conf[] = { {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL}, {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, - {"type", "DVB card type is autodetected and can't be overridden\n", CONF_TYPE_PRINT, CONF_NOCFG, 0 ,0, NULL}, {"timeout", &stream_defaults.timeout, CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL}, {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL}, @@ -629,8 +626,8 @@ dvb_channel_t *channel = NULL; dvb_priv_t *priv = stream->priv; - mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, TYPE: %s, FILE: %s)\r\n", - opts->prog, opts->card, opts->type, opts->file); + mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, FILE: %s)\r\n", + opts->prog, opts->card, opts->file); priv->is_on = 0;