RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Oliver Freyermuth 2019-10-01 23:40:35 +02:00
parent c15ec393dd
commit 1768ea0d15
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stream/dvbin.h
View File

@ -110,7 +110,6 @@ typedef struct {
int is_on;
int retry;
int timeout;
unsigned int last_freq;
bool switching_channel;
bool stream_used;

2
stream/stream_dvb.c
View File

@ -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++) {