htsp server: do not send incomplete CAID information

diff --git a/src/htsp_server.c b/src/htsp_server.c
index 955516c07a4ce5f2d1f08270a3f72964de6d3d4b..fe6dd8f711923b934e149ec969946c93285cfef0 100644 (file)
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -649,12 +649,11 @@ htsp_build_channel(channel_t *ch, const char *method, htsp_connection_t *htsp)
   LIST_FOREACH(ilm, &ch->ch_services, ilm_in2_link) {
     t = (service_t *)ilm->ilm_in1;
     htsmsg_t *svcmsg = htsmsg_create_map();
-    uint16_t caid;
     htsmsg_add_str(svcmsg, "name", service_nicename(t));
     htsmsg_add_str(svcmsg, "type", service_servicetype_txt(t));
-    if((caid = service_get_encryption(t)) != 0) {
-      htsmsg_add_u32(svcmsg, "caid", caid);
-      htsmsg_add_str(svcmsg, "caname", caid2name(caid));
+    if (service_is_encrypted(t)) {
+      htsmsg_add_u32(svcmsg, "caid", 65535);
+      htsmsg_add_str(svcmsg, "caname", tvh_gettext_lang(htsp->htsp_language, N_("Encrypted service")));
     }
     htsmsg_add_msg(services, NULL, svcmsg);
   }

diff --git a/src/service.c b/src/service.c
index 48a09360ff1a9742fa04c2f1539885a4e1b3cb3e..7d9bb1c110c8fa86838425ec302ea78169afbc99 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1650,30 +1650,6 @@ service_get_channel_icon ( service_t *s )
   return r;
 }
 
-/**
- * Get the encryption CAID from a service
- * only the first CA stream in a service is returned
- */
-uint16_t
-service_get_encryption(service_t *t)
-{
-  elementary_stream_t *st;
-  caid_t *c;
-
-  TAILQ_FOREACH(st, &t->s_components, es_link) {
-    switch(st->es_type) {
-    case SCT_CA:
-      LIST_FOREACH(c, &st->es_caids, link)
-       if(c->caid != 0)
-         return c->caid;
-      break;
-    default:
-      break;
-    }
-  }
-  return 0;
-}
-
 /*
  *
  */

diff --git a/src/service.h b/src/service.h
index 97dda55fe54674916ab642d221ee14d98c35b879..82dd15acccb60dcce2a148fad9e14dc349c9eae3 100644 (file)
--- a/src/service.h
+++ b/src/service.h
@@ -591,8 +591,6 @@ void service_refresh_channel(service_t *t);
 
 int tss2errcode(int tss);
 
-uint16_t service_get_encryption(service_t *t);
-
 htsmsg_t *servicetype_list (void);
 
 void service_load ( service_t *s, htsmsg_t *c );