Mercurial > mplayer.hg

comparison stream/stream_dvb.c @ 26390:b2cc442c095d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 37786c8469b2
children 16ab100f5870
comparison
equal deleted inserted replaced
26389:b65cf3a35900 26390:b2cc442c095d
61 static struct stream_priv_s 61 static struct stream_priv_s
62 { 62 {
63 char *prog; 63 char *prog;
64 int card; 64 int card;
65 char *type; 65 char *type;
66 int vid, aid;
67 int timeout; 66 int timeout;
68 char *file; 67 char *file;
69 } 68 }
70 stream_defaults = 69 stream_defaults =
71 { 70 {
72 "", 1, "", 0, 0, 30, NULL 71 "", 1, "", 30, NULL
73 }; 72 };
74 73
75 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f) 74 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f)
76 75
77 /// URL definition 76 /// URL definition
78 static const m_option_t stream_params[] = { 77 static const m_option_t stream_params[] = {
79 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL}, 78 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL},
80 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, 79 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
81 {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL}, 80 {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL},
82 {"vid", ST_OFF(vid), CONF_TYPE_INT, 0, 0 ,0, NULL},
83 {"aid", ST_OFF(aid), CONF_TYPE_INT, 0, 0 ,0, NULL},
84 {"timeout",ST_OFF(timeout), CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL}, 81 {"timeout",ST_OFF(timeout), CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL},
85 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL}, 82 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL},
86 83
87 {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL }, 84 {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL },
88 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, 85 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
100 97
101 const m_option_t dvbin_opts_conf[] = { 98 const m_option_t dvbin_opts_conf[] = {
102 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL}, 99 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL},
103 {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, 100 {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
104 {"type", "DVB card type is autodetected and can't be overridden\n", CONF_TYPE_PRINT, CONF_NOCFG, 0 ,0, NULL}, 101 {"type", "DVB card type is autodetected and can't be overridden\n", CONF_TYPE_PRINT, CONF_NOCFG, 0 ,0, NULL},
105 {"vid", &stream_defaults.vid, CONF_TYPE_INT, 0, 0 ,0, NULL},
106 {"aid", &stream_defaults.aid, CONF_TYPE_INT, 0, 0 ,0, NULL},
107 {"timeout", &stream_defaults.timeout, CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL}, 102 {"timeout", &stream_defaults.timeout, CONF_TYPE_INT, M_OPT_RANGE, 1, 30, NULL},
108 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL}, 103 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL},
109 104
110 {NULL, NULL, 0, 0, 0, 0, NULL} 105 {NULL, NULL, 0, 0, 0, 0, NULL}
111 }; 106 };
632 { 627 {
633 int i; 628 int i;
634 dvb_channel_t *channel = NULL; 629 dvb_channel_t *channel = NULL;
635 dvb_priv_t *priv = stream->priv; 630 dvb_priv_t *priv = stream->priv;
636 631
637 mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, VID: %d, AID: %d, TYPE: %s, FILE: %s)\r\n", 632 mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, TYPE: %s, FILE: %s)\r\n",
638 opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file); 633 opts->prog, opts->card, opts->type, opts->file);
639 634
640 priv->is_on = 0; 635 priv->is_on = 0;
641 636
642 i = 0; 637 i = 0;
643 while((channel == NULL) && i < priv->list->NUM_CHANNELS) 638 while((channel == NULL) && i < priv->list->NUM_CHANNELS)
729 } 724 }
730 725
731 726
732 priv->tuner_type = tuner_type; 727 priv->tuner_type = tuner_type;
733 728
734 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d, vid=%d, aid=%d\n", 729 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d\n",
735 p->prog, priv->card+1, priv->tuner_type, p->vid, p->aid); 730 p->prog, priv->card+1, priv->tuner_type);
736 731
737 priv->list = priv->config->cards[priv->card].list; 732 priv->list = priv->config->cards[priv->card].list;
738 733
739 if((! strcmp(p->prog, "")) && (priv->list != NULL)) 734 if((! strcmp(p->prog, "")) && (priv->list != NULL))
740 progname = priv->list->channels[0].name; 735 progname = priv->list->channels[0].name;