From 782cb80f2fb73bdd39fdbd94c9c64307cde451f3 Mon Sep 17 00:00:00 2001
From: Mariusz Bialonczyk <manio@skyboo.net>
Date: Sun, 1 Dec 2013 07:52:51 +0100
Subject: [PATCH] capmt: add webui oscam mode

---
 src/descrambler/capmt.c             |  2 +-
 src/webui/static/app/capmteditor.js | 31 ++++++++++++++++++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index e95132ea..a4fe0b97 100644
--- 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 a5928647..06fa1f78 100644
--- 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,