RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

removed useless parameter :type from -dvbin (the frontend type is reported by the card)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26423 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2008-04-12 20:36:57 +00:00
parent e23c244ee7
commit cc5373d7ca
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stream/stream_dvb.c
View File

@ -62,13 +62,12 @@ static struct stream_priv_s
{
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 @@ stream_defaults =
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 @@ static const struct m_struct_st stream_opts = {
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 @@ static int dvb_streaming_start(stream_t *stream, struct stream_priv_s *opts, int
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;