Mercurial > mplayer.hg
changeset 26390:b2cc442c095d
removed defunct options :vid and :aid from -dvbin (they were useless from the start)
| author | nicodvb |
|---|---|
| date | Sat, 12 Apr 2008 20:30:36 +0000 |
| parents | b65cf3a35900 |
| children | 16ab100f5870 |
| files | stream/stream_dvb.c |
| diffstat | 1 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/stream_dvb.c Sat Apr 12 18:35:11 2008 +0000 +++ b/stream/stream_dvb.c Sat Apr 12 20:30:36 2008 +0000 @@ -63,13 +63,12 @@ char *prog; int card; char *type; - int vid, aid; int timeout; char *file; } stream_defaults = { - "", 1, "", 0, 0, 30, NULL + "", 1, "", 30, NULL }; #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f) @@ -79,8 +78,6 @@ {"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}, - {"vid", ST_OFF(vid), CONF_TYPE_INT, 0, 0 ,0, NULL}, - {"aid", ST_OFF(aid), CONF_TYPE_INT, 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}, @@ -102,8 +99,6 @@ {"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}, - {"vid", &stream_defaults.vid, CONF_TYPE_INT, 0, 0 ,0, NULL}, - {"aid", &stream_defaults.aid, CONF_TYPE_INT, 0, 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}, @@ -634,8 +629,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, VID: %d, AID: %d, TYPE: %s, FILE: %s)\r\n", - opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file); + 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); priv->is_on = 0; @@ -731,8 +726,8 @@ priv->tuner_type = tuner_type; - mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d, vid=%d, aid=%d\n", - p->prog, priv->card+1, priv->tuner_type, p->vid, p->aid); + mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d\n", + p->prog, priv->card+1, priv->tuner_type); priv->list = priv->config->cards[priv->card].list;