From c70a515207d5774ad12f294e4dd50ec4b12204cc Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Fri, 22 Jun 2012 10:32:31 +0100 Subject: [PATCH 1/2] Minor tweak to setup ota grabber mux link. --- src/epggrab/ota.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/epggrab/ota.c b/src/epggrab/ota.c index 4c3f4393..6d4a1530 100644 --- a/src/epggrab/ota.c +++ b/src/epggrab/ota.c @@ -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 */ From d621b633e4d02199abad28bbb1489545096b8e46 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Fri, 22 Jun 2012 10:34:44 +0100 Subject: [PATCH 2/2] Minor printing tweak. --- src/dvb/dvb_fe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dvb/dvb_fe.c b/src/dvb/dvb_fe.c index 2cd7e0d8..5b134aaa 100644 --- a/src/dvb/dvb_fe.c +++ b/src/dvb/dvb_fe.c @@ -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