From: Jaroslav Kysela Date: Sat, 24 Nov 2018 18:42:31 +0000 (+0100) Subject: pass muxer: do not check for multiple active services (it might not be true), issue... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b65a99a4b017c5b24462121c4d3c8a450a952c11;p=thirdparty%2Ftvheadend.git pass muxer: do not check for multiple active services (it might not be true), issue #5344 --- diff --git a/src/channels.c b/src/channels.c index 57822ec02..996d81250 100644 --- a/src/channels.c +++ b/src/channels.c @@ -2002,19 +2002,3 @@ channel_has_correct_service_filter(const channel_t *ch, int svf) } return 0; } - -int channel_multi_services_active(const channel_t *ch) -{ - const idnode_list_mapping_t *ilm; - const service_t *service; - int cnt = 0; - if (!ch) return 0; - LIST_FOREACH(ilm, &ch->ch_services, ilm_in2_link) { - service = (const service_t*)ilm->ilm_in1; - if (service->s_enabled) { - if (++cnt > 1) - return 1; - } - } - return 0; -} diff --git a/src/channels.h b/src/channels.h index 97e8579d4..5d4bd79fb 100644 --- a/src/channels.h +++ b/src/channels.h @@ -221,6 +221,5 @@ channel_t **channel_get_sorted_list_for_tag channel_tag_t **channel_tag_get_sorted_list ( const char *sort_type, int *_count ); int channel_has_correct_service_filter(const channel_t *ch, int svf); -int channel_multi_services_active(const channel_t *ch); #endif /* CHANNELS_H */ diff --git a/src/webui/webui.c b/src/webui/webui.c index 63eb0d17a..8cb985002 100644 --- a/src/webui/webui.c +++ b/src/webui/webui.c @@ -450,8 +450,7 @@ http_stream_run(http_connection_t *hc, profile_chain_t *prch, break; case SMT_STOP: - if((mux->m_caps & MC_CAP_ANOTHER_SERVICE) != 0 && - channel_multi_services_active(s->ths_channel)) + if((mux->m_caps & MC_CAP_ANOTHER_SERVICE) != 0) /* give a chance to use another svc */ break; if(sm->sm_code != SM_CODE_SOURCE_RECONFIGURED) { tvhwarn(LS_WEBUI, "Stop streaming %s, %s", hc->hc_url_orig,