From f8399f830656cca802fcffc4e74457a92b1045c2 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 23 Jun 2014 15:55:04 +0200 Subject: [PATCH] service, cwc, capmt: more es_filt_link fixes --- src/descrambler/capmt.c | 4 ++-- src/descrambler/cwc.c | 4 ++-- src/service.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c index 570f1027..e2dcf2bf 100644 --- a/src/descrambler/capmt.c +++ b/src/descrambler/capmt.c @@ -1517,7 +1517,7 @@ capmt_caid_change(th_descrambler_t *td) lock_assert(&t->s_stream_mutex); - TAILQ_FOREACH(st, &t->s_filt_components, es_link) { + TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link) { LIST_FOREACH(c, &st->es_caids, link) { /* search ecmpid in list */ LIST_FOREACH(cce, &ct->ct_caid_ecm, cce_link) @@ -1794,7 +1794,7 @@ capmt_service_start(service_t *s) change = 0; pthread_mutex_lock(&t->s_stream_mutex); - TAILQ_FOREACH(st, &t->s_filt_components, es_link) { + TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link) { caid_t *c; LIST_FOREACH(c, &st->es_caids, link) { if(c == NULL || c->use == 0) diff --git a/src/descrambler/cwc.c b/src/descrambler/cwc.c index a2bddde3..0f249061 100755 --- a/src/descrambler/cwc.c +++ b/src/descrambler/cwc.c @@ -1968,7 +1968,7 @@ cwc_service_start(service_t *t) pthread_mutex_lock(&t->s_stream_mutex); LIST_FOREACH(pcard, &cwc->cwc_cards, cs_card) { if (pcard->cwc_caid == 0) continue; - TAILQ_FOREACH(st, &t->s_filt_components, es_link) { + TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link) { LIST_FOREACH(c, &st->es_caids, link) { if (c->use && c->caid == pcard->cwc_caid) break; @@ -2004,7 +2004,7 @@ cwc_service_start(service_t *t) pthread_mutex_lock(&t->s_stream_mutex); i = 0; - TAILQ_FOREACH(st, &t->s_filt_components, es_link) { + TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link) { LIST_FOREACH(c, &st->es_caids, link) if (c->use && c->caid == pcard->cwc_caid) { ct->cs_epids[i++] = st->es_pid; diff --git a/src/service.c b/src/service.c index aa0d6cb5..f811c527 100644 --- a/src/service.c +++ b/src/service.c @@ -574,7 +574,7 @@ service_start(service_t *t, int instance) /** * Initialize stream */ - TAILQ_FOREACH(st, &t->s_filt_components, es_link) + TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link) stream_init(st); pthread_mutex_unlock(&t->s_stream_mutex);