Added multi flag to CA configuration.

Signed-off-by: Jasmin Jessich <jasmin@anw.at>

diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c
index b9f99e0ba1e55ec5cf2b8df3a1612696bfe9eccc..0bba68e02d008bd33cbfc08b91485b2f2156b34b 100644 (file)
--- a/src/descrambler/dvbcam.c
+++ b/src/descrambler/dvbcam.c
@@ -66,6 +66,7 @@ typedef struct dvbcam {
   caclient_t;
   LIST_HEAD(,dvbcam_active_service) services;
   int limit;
+  int multi;
   int caid_select;
   uint16_t caid_list[32];
 } dvbcam_t;
@@ -865,7 +866,7 @@ const idclass_t caclient_dvbcam_class =
       .type     = PT_INT,
       .id       = "caid_select",
       .name     = N_("CAID selection"),
-      .desc     = N_("Selection method for CAID"),
+      .desc     = N_("Selection method for CAID."),
       .list     = caclient_dvbcam_class_caid_selection_list,
       .off      = offsetof(dvbcam_t, caid_select),
       .opts     = PO_DOC_NLIST,
@@ -881,6 +882,14 @@ const idclass_t caclient_dvbcam_class =
       .get      = caclient_dvbcam_class_caid_list_get,
       .group    = 2,
     },
+    {
+      .type     = PT_BOOL,
+      .id       = "multi",
+      .name     = N_("CAM can decode multiple channels"),
+      .desc     = N_("To enable MCD and MTD for this CAM."),
+      .off      = offsetof(dvbcam_t, multi),
+      .group    = 2,
+    },
     {}
   }
 };

diff --git a/src/webui/static/app/caclient.js b/src/webui/static/app/caclient.js
index 9a08cf2e9aa835579846b7112712630f7b5cabdb..0d82da90e1fc9b9e83321467b21b2c90184863c0 100644 (file)
--- a/src/webui/static/app/caclient.js
+++ b/src/webui/static/app/caclient.js
@@ -25,7 +25,7 @@ tvheadend.caclient = function(panel, index) {
     var list = 'enabled,name,username,password,hostname,mode,camdfilename,' +
                'port,cwmode,deskey,emm,emmex,caid,providerid,tsid,sid,' +
                'key_even,key_odd,keepalive_interval,comment,extended,' +
-               'nodeid,version,limit,caid_select,caid_list';
+               'nodeid,version,limit,caid_select,caid_list,multi';
 
     tvheadend.idnode_form_grid(panel, {
         clazz: 'caclient',