service dialog: filter our PCR streams (dup), print CAIDs for CAT type, too

diff --git a/src/api/api_service.c b/src/api/api_service.c
index d2d730e3ed1a5ba507c18b38934af4fcfbdf986b..fa39a4c4826261fa3a3392b79befd321a20554fb 100644 (file)
--- a/src/api/api_service.c
+++ b/src/api/api_service.c
@@ -144,13 +144,17 @@ api_service_streams
     htsmsg_add_str(e, "type", "PMT");
     htsmsg_add_msg(st, NULL, e);
   }
-  TAILQ_FOREACH(es, &s->s_components, es_link)
+  TAILQ_FOREACH(es, &s->s_components, es_link) {
+    if (es->es_type == SCT_PCR) continue;
     htsmsg_add_msg(st, NULL, api_service_streams_get_one(es, 0));
+  }
   if (TAILQ_FIRST(&s->s_filt_components) == NULL ||
       s->s_status == SERVICE_IDLE)
     service_build_filter(s);
-  TAILQ_FOREACH(es, &s->s_filt_components, es_filt_link)
+  TAILQ_FOREACH(es, &s->s_filt_components, es_filt_link) {
+    if (es->es_type == SCT_PCR) continue;
     htsmsg_add_msg(stf, NULL, api_service_streams_get_one(es, 1));
+  }
   *resp = htsmsg_create_map();
   htsmsg_add_str(*resp, "name", s->s_nicename);
   if (s->s_hbbtv)

diff --git a/src/webui/static/app/mpegts.js b/src/webui/static/app/mpegts.js
index 6e827826c93e52f9bab7e9144852d80f3daf89df..07ef420615ca2c1274288fbc08d1b8e7410e7665 100644 (file)
--- a/src/webui/static/app/mpegts.js
+++ b/src/webui/static/app/mpegts.js
@@ -188,7 +188,7 @@ tvheadend.show_service_streams = function(data) {
         html += '<td>' + p + '</td>';
         html += '<td>' + s.type + '</td>';
         html += '<td>' + (s.language || '&nbsp;') + '</td>';
-        if (s.type === 'CA') {
+        if (s.type === 'CA' || s.type === 'CAT') {
             d = _('CAIDS: ');
             for (j = 0; j < s.caids.length; j++) {
                 if (j > 0)