diff options
author | Oliver Freyermuth <o.freyermuth@googlemail.com> | 2019-10-01 23:40:35 +0200 |
---|---|---|
committer | Oliver Freyermuth <o.freyermuth@googlemail.com> | 2019-10-02 01:25:45 +0200 |
commit | 1768ea0d1576136130cb5f2b7f459704031bafd2 (patch) | |
tree | 1134f01f64b457177762b403cb84360524379ba7 /stream/stream_dvb.c | |
parent | c15ec393dd2b75fa0b7c7f567abd16528e43ce44 (diff) | |
download | mpv-1768ea0d1576136130cb5f2b7f459704031bafd2.tar.bz2 mpv-1768ea0d1576136130cb5f2b7f459704031bafd2.tar.xz |
stream_dvb: Move stream->is_on initialization to state preparation.
Notably, this allows to call dvb_streaming_start more than once,
simplifying e.g. channel switching.
Also, get rid of unused timeout variable.
Diffstat (limited to 'stream/stream_dvb.c')
-rw-r--r-- | stream/stream_dvb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 0198ba7d8d..a6c98b91bc 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -1026,7 +1026,6 @@ static int dvb_streaming_start(stream_t *stream, char *progname) MP_VERBOSE(stream, "\r\ndvb_streaming_start(PROG: %s, ADAPTER: %d)\n", progname, priv->devno); - state->is_on = 0; list = state->adapters[state->cur_adapter].list; for (i = 0; i < list->NUM_CHANNELS; i ++) { if (!strcmp(list->channels[i].name, progname)) { @@ -1204,6 +1203,7 @@ dvb_state_t *dvb_get_state(stream_t *stream) return NULL; memset(state, 0x00, sizeof(dvb_state_t)); state->switching_channel = false; + state->is_on = 0; state->stream_used = true; state->fe_fd = state->dvr_fd = -1; for (unsigned int i = 0; i < MAX_ADAPTERS; i++) { |