0001-add-CA-id-and-name-to-the-channel-entry-in-htsp.patch - Tvheadend

Feature #299 » 0001-add-CA-id-and-name-to-the-channel-entry-in-htsp.patch

updated to apply to the current trunk and sends the encryption name too - Lars Op den Kamp -, 2010-11-13 12:03

       channel_tag_mapping_t *ctm;
       channel_tag_t *ct;
       th_transport_t *t;
       uint16_t caid = 0;
       htsmsg_t *out = htsmsg_create_map();
       htsmsg_t *tags = htsmsg_create_list();
-...
         htsmsg_add_str(svcmsg, "name", transport_nicename(t));
         htsmsg_add_str(svcmsg, "type", transport_servicetype_txt(t));
         htsmsg_add_msg(services, NULL, svcmsg);
         if (caid == 0) {
           caid = transport_get_encryption(t);
+        }
+      }
       htsmsg_add_msg(out, "services", services);
       htsmsg_add_msg(out, "tags", tags);
       htsmsg_add_str(out, "method", method);
       htsmsg_add_u32(out, "channelCaId", caid);
       htsmsg_add_str(out, "channelCaName", psi_caid2name(caid));
       return out;
+    }

+    }
     /**
      * Get the encryption CAID from a transport
      * only the first CA stream in a transport is returned
      */
     uint16_t
     transport_get_encryption(th_transport_t *t)
+    {
       th_stream_t *st;
       caid_t *c;
       TAILQ_FOREACH(st, &t->tht_components, st_link) {
         switch(st->st_type) {
           case SCT_CA:
             while((c = LIST_FIRST(&st->st_caids)) != NULL) {
               if (c->caid) {
                 return c->caid;
+              }
+            }
             break;
           default:
             break;
+            }
+      }
       return 0;
+    }
     /**
      * Get the signal status from a transport

     int tss2errcode(int tss);
     uint16_t transport_get_encryption(th_transport_t *t);
     int transport_get_signal_status(th_transport_t *t, signal_status_t *status);
     #endif /* TRANSPORTS_H */
+    -

(3-3/3)