diff --git a/src/dvb/dvb_service.c b/src/dvb/dvb_service.c index 65b7fbf5..31f1b9e7 100644 --- a/src/dvb/dvb_service.c +++ b/src/dvb/dvb_service.c @@ -447,6 +447,7 @@ dvb_service_build_msg(service_t *t) { th_dvb_mux_instance_t *tdmi = t->s_dvb_mux_instance; htsmsg_t *m = htsmsg_create_map(); + uint16_t caid; char buf[100]; htsmsg_add_str(m, "id", t->s_identifier); @@ -464,6 +465,9 @@ dvb_service_build_msg(service_t *t) htsmsg_add_str(m, "network", tdmi->tdmi_network ?: ""); + if((caid = service_get_encryption(t)) != 0) + htsmsg_add_str(m, "encryption", psi_caid2name(caid)); + dvb_mux_nicefreq(buf, sizeof(buf), tdmi); htsmsg_add_str(m, "mux", buf); diff --git a/src/psi.c b/src/psi.c index 4d49ca71..07f7d3cd 100644 --- a/src/psi.c +++ b/src/psi.c @@ -874,6 +874,7 @@ static struct strtab caidnametab[] = { { "CryptoWorks ICE", 0x0D96 }, { "CryptoWorks ICE", 0x0D97 }, { "PowerVu", 0x0E00 }, + { "PowerVu", 0x0E11 }, { "Sony", 0x0F00 }, { "Tandberg", 0x1000 }, { "Thompson", 0x1100 }, diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js index 0f1b836f..c3a3f314 100644 --- a/src/webui/static/app/dvb.js +++ b/src/webui/static/app/dvb.js @@ -497,6 +497,10 @@ tvheadend.dvb_services = function(adapterId) { header : "Network", dataIndex : 'network', width : 100 + }, { + header : "Encryption", + dataIndex : 'encryption', + width : 100 }, { header : "Multiplex", dataIndex : 'mux', @@ -526,8 +530,8 @@ tvheadend.dvb_services = function(adapterId) { var store = new Ext.data.JsonStore({ root : 'entries', fields : Ext.data.Record.create([ 'id', 'enabled', 'type', 'sid', 'pmt', - 'pcr', 'svcname', 'network', 'provider', 'mux', 'channelname', 'prefcapid', - 'dvb_charset', 'dvb_eit_enable' ]), + 'pcr', 'svcname', 'network', 'provider', 'encryption', 'mux', 'channelname', + 'prefcapid', 'dvb_charset', 'dvb_eit_enable' ]), url : "dvb/services/" + adapterId, autoLoad : true, id : 'id',