Mercurial > mplayer.hg

comparison stream/stream_dvb.c @ 30625:bc29a1172753

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace misuse of stream_reset to set stream pos to 0 by more appropriate code.
author reimar
date Sat, 20 Feb 2010 18:39:26 +0000
parents b5e34617a096
children d9bbd1844876
comparison
equal deleted inserted replaced
30624:60818f87a285 30625:bc29a1172753
546 priv->retry = 5; 546 priv->retry = 5;
547 new_list->current = n; 547 new_list->current = n;
548 stream->fd = priv->dvr_fd; 548 stream->fd = priv->dvr_fd;
549 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: new channel name=%s, card: %d, channel %d\n", channel->name, card, n); 549 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: new channel name=%s, card: %d, channel %d\n", channel->name, card, n);
550 550
551 stream->eof=1; 551 stream->buf_pos = stream->buf_len = 0;
552 stream_reset(stream); 552 stream->pos = 0;
553 553 stream->eof = 0;
554 554
555 if(channel->freq != priv->last_freq) 555 if(channel->freq != priv->last_freq)
556 if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone, 556 if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone,
557 channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr, channel->cr_lp, channel->hier, priv->timeout)) 557 channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr, channel->cr_lp, channel->hier, priv->timeout))
558 return 0; 558 return 0;