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

Merge branch 'epg-autoscan' into epg-eitscan

Browse source
This commit is contained in:
Adam Sutton 2012-06-22 10:34:57 +01:00
commit a454c80dbf
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dvb/dvb_fe.c
View file

@ -492,9 +492,9 @@ dvb_fe_tune(th_dvb_mux_instance_t *tdmi, const char *reason)
#if DVB_API_VERSION >= 5
if (tda->tda_type == FE_QPSK) {
tvhlog(LOG_DEBUG, "dvb", "\"%s\" tuning via s2api to \"%s\" (%d, %d Baud, "
"%s, %s, %s)", tda->tda_rootpath, buf, p->frequency, p->u.qpsk.symbol_rate,
"%s, %s, %s) for %s", tda->tda_rootpath, buf, p->frequency, p->u.qpsk.symbol_rate,
dvb_mux_fec2str(p->u.qpsk.fec_inner), dvb_mux_delsys2str(dmc.dmc_fe_delsys),
dvb_mux_qam2str(dmc.dmc_fe_modulation));
dvb_mux_qam2str(dmc.dmc_fe_modulation), reason);
r = dvb_fe_tune_s2(tdmi, &dmc);
} else

6
src/epggrab/ota.c
View file

@ -33,7 +33,11 @@ epggrab_ota_mux_t *epggrab_ota_register
/* Check for existing */
LIST_FOREACH(ota, &ota_muxes, glob_link) {
if (ota->grab == mod && ota->tdmi == tdmi) return ota;
if (ota->grab == mod && ota->tdmi == tdmi) {
ota->timeout = MAX(ota->timeout, timeout);
ota->interval = MIN(ota->interval, interval);
return ota;
}
}
/* Install new */