mirror of https://github.com/mpv-player/mpv
match exactly card number N specified, rather than the N-th actually usable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21257 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
0fe6e9fbd2
commit
30155960a4
|
@ -666,7 +666,7 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
|
||||||
struct stream_priv_s* p = (struct stream_priv_s*)opts;
|
struct stream_priv_s* p = (struct stream_priv_s*)opts;
|
||||||
dvb_priv_t *priv;
|
dvb_priv_t *priv;
|
||||||
char *progname;
|
char *progname;
|
||||||
int tuner_type = 0;
|
int tuner_type = 0, i;
|
||||||
|
|
||||||
|
|
||||||
if(mode != STREAM_READ)
|
if(mode != STREAM_READ)
|
||||||
|
@ -688,13 +688,22 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
|
||||||
dvb_config->priv = priv;
|
dvb_config->priv = priv;
|
||||||
priv->config = dvb_config;
|
priv->config = dvb_config;
|
||||||
|
|
||||||
if(p->card < 1 || p->card > priv->config->count)
|
priv->card = -1;
|
||||||
|
for(i=0; i<priv->config->count; i++)
|
||||||
|
{
|
||||||
|
if(priv->config->cards[i].devno+1 == p->card)
|
||||||
|
{
|
||||||
|
priv->card = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(priv->card == -1)
|
||||||
{
|
{
|
||||||
free(priv);
|
free(priv);
|
||||||
mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n", p->card);
|
mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n", p->card);
|
||||||
return STREAM_ERROR;
|
return STREAM_ERROR;
|
||||||
}
|
}
|
||||||
priv->card = p->card - 1;
|
|
||||||
priv->timeout = p->timeout;
|
priv->timeout = p->timeout;
|
||||||
|
|
||||||
tuner_type = priv->config->cards[priv->card].type;
|
tuner_type = priv->config->cards[priv->card].type;
|
||||||
|
|
Loading…
Reference in New Issue