pass muxer: do not check for multiple active services (it might not be true), issue...

diff --git a/src/channels.c b/src/channels.c
index 57822ec02885d87554399de0ca7d25848c3b4cd2..996d81250da8d618bee0f2d0d5f0a542287c0995 100644 (file)
--- 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 97e8579d4a79960b63232aa2438943c369b3b8aa..5d4bd79fb5e10dd9c4380935321be0d7927f4f22 100644 (file)
--- 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 63eb0d17a78eaad70e7d06e288831575a9070d4b..8cb985002b8549b94ec3fc144c69fc7c52646238 100644 (file)
--- 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,