summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-15 13:37:41 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-15 13:37:41 +0000
commit22d9f6ea0cdfbf97a284ad93c69638932b426d5a (patch)
treed643668cbeac75cd85fbc201985538118a85c9ae /stream
parenta9d2f4db42923f195ea05c5f30f4a32a1aa6fb04 (diff)
downloadmpv-22d9f6ea0cdfbf97a284ad93c69638932b426d5a.tar.bz2
mpv-22d9f6ea0cdfbf97a284ad93c69638932b426d5a.tar.xz
removed the obscene priv->stream entry. Someone must have injected vodka in my milk when I wrote it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25408 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/dvbin.h1
-rw-r--r--stream/stream_dvb.c7
2 files changed, 3 insertions, 5 deletions
diff --git a/stream/dvbin.h b/stream/dvbin.h
index 1c77eeb6bc..6c04d95438 100644
--- a/stream/dvbin.h
+++ b/stream/dvbin.h
@@ -97,7 +97,6 @@ typedef struct {
dvb_channels_list *list;
int tuner_type;
int is_on;
- stream_t *stream;
int retry;
int timeout;
int last_freq;
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 23938cd176..5204570c60 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -626,11 +626,11 @@ static void dvbin_close(stream_t *stream)
}
-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 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
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 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
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;