Issue #1532 - service: ensure that only fully enabled services are used.

This uses the new s_is_enabled() callback routine to check if the
service chain is completely enabled. For DVB services this will
also check the container mux and adapter.

diff --git a/src/service.c b/src/service.c
index 67353021ca6f9e5fd4bc6ab83880700f407fac6b..a22eec777c8fd73a18891e5abe3d47ea2d1e2d9e 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -335,7 +335,7 @@ service_find(channel_t *ch, unsigned int weight, const char *loginfo,
   cnt = 0;
   LIST_FOREACH(t, &ch->ch_services, s_ch_link) {
 
-    if(!t->s_enabled) {
+    if(!t->s_is_enabled(t)) {
       if(loginfo != NULL) {
        tvhlog(LOG_NOTICE, "Service", "%s: Skipping \"%s\" -- not enabled",
               loginfo, service_nicename(t));
@@ -1179,11 +1179,7 @@ service_is_primary_epg(service_t *svc)
   service_t *ret = NULL, *t;
   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 (!t->s_is_enabled(t) || !t->s_dvb_eit_enable) continue;
     if (!ret || service_get_prio(t) < service_get_prio(ret))
       ret = t;
   }