capmt: add webui oscam mode

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index e95132eafbc7a51352f5acbdddf5e1b94f6a89ea..a4fe0b97ffe730a20dd389df826f1c877c5dbd6d 100644 (file)
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -1023,7 +1023,7 @@ capmt_record_build(capmt_t *capmt)
 
   htsmsg_add_str(e, "camdfilename", capmt->capmt_sockfile ?: "");
   htsmsg_add_u32(e, "port", capmt->capmt_port);
-  htsmsg_add_u32(e, "oscam", !!capmt->capmt_oscam);
+  htsmsg_add_u32(e, "oscam", capmt->capmt_oscam);
   htsmsg_add_str(e, "comment", capmt->capmt_comment ?: "");
   
   return e;

diff --git a/src/webui/static/app/capmteditor.js b/src/webui/static/app/capmteditor.js
index a592864761df844644adef39efcabdb4b9d1db18..06fa1f78fd6b99ac2e73af3113c308753e39dbe5 100644 (file)
--- a/src/webui/static/app/capmteditor.js
+++ b/src/webui/static/app/capmteditor.js
@@ -13,6 +13,24 @@ tvheadend.capmteditor = function() {
                        meta.attr = 'style="color:red;"';
                }
        }
+       var selectMode = new Ext.form.ComboBox({
+               displayField:'name',
+               valueField: 'res',
+               value: 2,
+               mode: 'local',
+               editable: false,
+               triggerAction: 'all',
+               emptyText: 'Select mode...',
+               store: new Ext.data.SimpleStore({
+                       fields: ['res','name'],
+                       id: 0,
+                       data: [
+                               ['2','Recent OSCam (svn rev >= 9063)'],
+                               ['1','Older OSCam'],
+                               ['0','Wrapper (capmt_ca.so)']
+                       ]
+               })
+       });
 
        var cm = new Ext.grid.ColumnModel({
   defaultSortable: true,
@@ -21,7 +39,12 @@ tvheadend.capmteditor = function() {
                header : "Enabled",
                dataIndex : 'enabled',
                width : 60
-          }, {
+       }, {
+               header: "Mode",
+               dataIndex: 'oscam',
+               width: 150,
+               editor: selectMode
+       }, {
                header : "Camd.socket Filename",
                dataIndex : 'camdfilename',
                width : 200,
@@ -43,12 +66,6 @@ tvheadend.capmteditor = function() {
                        allowBlank : false
                })
        }, {
-            xtype: 'checkcolumn',
-               header : "OSCam mode",
-               dataIndex : 'oscam',
-               width : 60
-
-        } , {
                header : "Comment",
                dataIndex : 'comment',
                width : 400,