stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Ensure that all muxes have at least 1 initalscan before they can be skipped.

Browse source
This commit is contained in:
Adam Sutton 2012-07-31 12:27:23 +01:00
parent f65391d1bd
commit b1b80076bb
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/dvb/dvb_multiplex.c
View file

@ -525,6 +525,8 @@ dvb_mux_save(th_dvb_mux_instance_t *tdmi)
htsmsg_add_u32(m, "frequency", f->frequency);
htsmsg_add_u32(m, "initialscan", tdmi->tdmi_table_initial);
switch(tdmi->tdmi_adapter->tda_type) {
case FE_OFDM:
htsmsg_add_str(m, "bandwidth",
@ -605,7 +607,7 @@ tdmi_create_by_msg(th_dvb_adapter_t *tda, htsmsg_t *m, const char *identifier)
struct dvb_mux_conf dmc;
const char *s;
int r;
unsigned int tsid, u32, enabled;
unsigned int tsid, u32, enabled, initscan;
memset(&dmc, 0, sizeof(dmc));
@ -729,9 +731,13 @@ tdmi_create_by_msg(th_dvb_adapter_t *tda, htsmsg_t *m, const char *identifier)
else
dmc.dmc_satconf = NULL;
initscan = htsmsg_get_u32_or_default(m, "initialscan", 1);
if (!initscan && !tda->tda_skip_initialscan)
initscan = 1;
tdmi = dvb_mux_create(tda, &dmc,
tsid, htsmsg_get_str(m, "network"), NULL, enabled,
tda->tda_skip_initialscan ? 0 : 1,
initscan,
identifier, NULL);
if(tdmi != NULL) {