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

dvb: ignore disabled adapters when finding EPG services.

Browse source
This commit is contained in:
Adam Sutton 2013-01-11 13:30:29 +00:00
parent 622531e385
commit bb51160721
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dvb/dvb_service.c
View file

@ -351,9 +351,10 @@ dvb_service_find3
service_t *svc;
if (tdmi) {
LIST_FOREACH(svc, &tdmi->tdmi_transports, s_group_link) {
if (sid != svc->s_dvb_service_id) continue;
if (enabled && !svc->s_enabled) continue;
if (epgprimary && !service_is_primary_epg(svc)) continue;
if (sid == svc->s_dvb_service_id) return svc;
return svc;
}
} else if (tda) {
LIST_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link) {

3
src/service.c
View file

@ -1180,6 +1180,9 @@ service_is_primary_epg(service_t *svc)
if (!svc || !svc->s_ch) return 0;
LIST_FOREACH(t, &svc->s_ch->ch_services, s_ch_link) {
if (!t->s_dvb_mux_instance) continue;
if (!t->s_dvb_mux_instance->tdmi_enabled) continue;
if (!t->s_dvb_mux_instance->tdmi_adapter->tda_enabled) continue;
if (!t->s_dvb_mux_instance->tdmi_adapter->tda_rootpath) continue;
if (!t->s_enabled || !t->s_dvb_eit_enable) continue;
if (!ret || service_get_prio(t) < service_get_prio(ret))
ret = t;