Mercurial > mplayer.hg
changeset 25380:5857ec4dedb4
removed the obscene priv->stream entry. Someone must have injected vodka in my milk when I wrote it
| author | nicodvb |
|---|---|
| date | Sat, 15 Dec 2007 13:37:41 +0000 |
| parents | 9befb9809011 |
| children | beda94ca3895 |
| files | stream/dvbin.h stream/stream_dvb.c |
| diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/dvbin.h Sat Dec 15 13:30:44 2007 +0000 +++ b/stream/dvbin.h Sat Dec 15 13:37:41 2007 +0000 @@ -97,7 +97,6 @@ dvb_channels_list *list; int tuner_type; int is_on; - stream_t *stream; int retry; int timeout; int last_freq;
--- a/stream/stream_dvb.c Sat Dec 15 13:30:44 2007 +0000 +++ b/stream/stream_dvb.c Sat Dec 15 13:37:41 2007 +0000 @@ -626,11 +626,11 @@ } -static int dvb_streaming_start(dvb_priv_t *priv, struct stream_priv_s *opts, int tuner_type, char *progname) +static int dvb_streaming_start(stream_t *stream, struct stream_priv_s *opts, int tuner_type, char *progname) { int i; dvb_channel_t *channel = NULL; - stream_t *stream = (stream_t*) priv->stream; + dvb_priv_t *priv = stream->priv; mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, VID: %d, AID: %d, TYPE: %s, FILE: %s)\r\n", opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file); @@ -691,7 +691,6 @@ return STREAM_ERROR; priv = (dvb_priv_t *)stream->priv; - priv->stream = stream; priv->config = dvb_get_config(); if(priv->config == NULL) { @@ -741,7 +740,7 @@ progname = p->prog; - if(! dvb_streaming_start(priv, p, tuner_type, progname)) + if(! dvb_streaming_start(stream, p, tuner_type, progname)) { free(stream->priv); stream->priv = NULL;