[MPlayer-cvslog] r26423 - trunk/stream/stream_dvb.c

[nicodvb]

Author: nicodvb
Date: Sat Apr 12 22:36:57 2008
New Revision: 26423

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

Modified:
   trunk/stream/stream_dvb.c

Modified: trunk/stream/stream_dvb.c
==============================================================================
--- trunk/stream/stream_dvb.c	(original)
+++ trunk/stream/stream_dvb.c	Sat Apr 12 22:36:57 2008
@@ -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_o
 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 
 	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;