diff --git a/src/dvb/dvb.h b/src/dvb/dvb.h index ef14d426..391cb686 100644 --- a/src/dvb/dvb.h +++ b/src/dvb/dvb.h @@ -193,7 +193,7 @@ th_transport_t *dvb_transport_find(th_dvb_mux_instance_t *tdmi, /** * DVB Frontend */ -void dvb_fe_tune(th_dvb_mux_instance_t *tdmi); +void dvb_fe_tune(th_dvb_mux_instance_t *tdmi, const char *reason); void dvb_fe_stop(th_dvb_mux_instance_t *tdmi); diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c index eaeabcb8..b8440fd5 100644 --- a/src/dvb/dvb_adapter.c +++ b/src/dvb/dvb_adapter.c @@ -312,7 +312,7 @@ dvb_adapter_mux_scanner(void *aux) /* Push to tail of queue */ TAILQ_REMOVE(tdmi->tdmi_scan_queue, tdmi, tdmi_scan_link); TAILQ_INSERT_TAIL(tdmi->tdmi_scan_queue, tdmi, tdmi_scan_link); - dvb_fe_tune(tdmi); + dvb_fe_tune(tdmi, "Autoscan"); } } diff --git a/src/dvb/dvb_fe.c b/src/dvb/dvb_fe.c index 2531f981..9756e0cb 100644 --- a/src/dvb/dvb_fe.c +++ b/src/dvb/dvb_fe.c @@ -141,7 +141,7 @@ dvb_fe_monitor(void *aux) dvb_mux_nicename(buf, sizeof(buf), tdmi); - tvhlog(LOG_NOTICE, "dvb", "\"%s\" on adapter \"%s\", status changed to %s", + DEBUGLOG("dvb", "\"%s\" on adapter \"%s\", status changed to %s", buf, tda->tda_displayname, dvb_mux_status(tdmi)); savemux = 1; } @@ -195,7 +195,7 @@ dvb_fe_stop(th_dvb_mux_instance_t *tdmi) * */ void -dvb_fe_tune(th_dvb_mux_instance_t *tdmi) +dvb_fe_tune(th_dvb_mux_instance_t *tdmi, const char *reason) { th_dvb_adapter_t *tda = tdmi->tdmi_adapter; struct dvb_frontend_parameters p = tdmi->tdmi_fe_params; @@ -239,10 +239,15 @@ dvb_fe_tune(th_dvb_mux_instance_t *tdmi) p.frequency = abs(p.frequency - lowfreq); } + dvb_mux_nicename(buf, sizeof(buf), tdmi); + tda->tda_fe_monitor_hold = 4; + + DEBUGLOG("dvb", "\"%s\" tuning to \"%s\" (%s)", tda->tda_rootpath, buf, + reason); + r = ioctl(tda->tda_fe_fd, FE_SET_FRONTEND, &p); if(r != 0) { - dvb_mux_nicename(buf, sizeof(buf), tdmi); tvhlog(LOG_ERR, "dvb", "\"%s\" tuning to \"%s\"" " -- Front configuration failed -- %s", tda->tda_rootpath, buf, strerror(errno)); diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c index 903b1517..51bd961d 100644 --- a/src/dvb/dvb_transport.c +++ b/src/dvb/dvb_transport.c @@ -118,7 +118,7 @@ dvb_transport_start(th_transport_t *t, unsigned int weight, int status, t->tht_status = status; - dvb_fe_tune(tdmi); + dvb_fe_tune(tdmi, "Transport start"); pthread_mutex_unlock(&tda->tda_delivery_mutex);