X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4a90e3afaa6d24fc82955b1ffc8a7f0237c618b2..4503ea2ae9eb021a1a2a665a161357305d4095f9:/lib/python/Screens/Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index cf9efd10..b516ec70 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -15,6 +15,13 @@ from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPytho
 
 TYPE_MENU = 0
 TYPE_CONFIG = 1
+MAX_NUM_CI = 4
+
+def InitCiConfig():
+	config.ci = [ ]
+	for slot in range(MAX_NUM_CI):
+		config.ci.append(ConfigSubsection())
+		config.ci[slot].canDescrambleMultipleServices = configElement("config.ci%d.canDescrambleMultipleServices"%(slot), configSelection, 0, (("auto", _("Auto")), ("no", _("No")), ("yes", _("Yes"))))
 
 class CiMmi(Screen):
 	def __init__(self, session, slotid, action):
@@ -264,28 +271,47 @@ class CiSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
-		self["actions"] = ActionMap(["OkCancelActions"],
+		self["actions"] = ActionMap(["OkCancelActions", "CiSelectionActions"],
 			{
+				"left": self.keyLeft,
+				"right": self.keyLeft,
 				"ok": self.okbuttonClick,
 				"cancel": self.cancel
-			})
+			},-1)
 
 		self.dlg = None
 		self.state = { }
 		self.list = [ ]
-		self["entries"] = MenuList(list)
-		self.clearMenu()
-		self.createMenu(0) # FIXME more than one CI
-		CiHandler.registerCIMessageHandler(0, self.ciStateChanged)
 
-	def clearMenu(self):
-		self.list = [ ]
+		for slot in range(MAX_NUM_CI):
+			state = eDVBCI_UI.getInstance().getState(slot)
+			if state != -1:
+				self.appendEntries(slot, state)
+				CiHandler.registerCIMessageHandler(slot, self.ciStateChanged)
 
-	def createMenu(self, slot):
+		menuList = ConfigList(list)
+		menuList.list = self.list
+		menuList.l.setList(self.list)
+		self["entries"] = menuList
+
+	def keyConfigEntry(self, key):
+		try:
+			self["entries"].handleKey(key)
+			self["entries"].getCurrent()[1].save()
+		except:
+			pass
+
+	def keyLeft(self):
+		self.keyConfigEntry(config.key["prevElement"])
+
+	def keyRight(self):
+		self.keyConfigEntry(config.key["nextElement"])
+
+	def appendEntries(self, slot, state):
+		self.state[slot] = state
 		self.list.append( (_("Reset"), 0, slot) )
 		self.list.append( (_("Init"), 1, slot) )
 
-		self.state[slot] = eDVBCI_UI.getInstance().getState(slot)
 		if self.state[slot] == 0:			#no module
 			self.list.append( (_("no module found"), 2, slot) )
 		elif self.state[slot] == 1:		#module in init
@@ -295,8 +321,31 @@ class CiSelection(Screen):
 			appname = eDVBCI_UI.getInstance().getAppName(slot)
 			self.list.append( (appname, 2, slot) )
 
-		self["entries"].list = self.list
-		self["entries"].l.setList(self.list)
+		self.list.append(getConfigListEntry(_("Multiple service support"), config.ci[slot].canDescrambleMultipleServices))
+
+	def updateState(self, slot):
+		state = eDVBCI_UI.getInstance().getState(slot)
+		self.state[slot] = state
+
+		slotidx=0
+		while self.list[slotidx][2] != slot:
+			slotidx += 1
+
+		slotidx += 1 # do not change Reset
+		slotidx += 1 # do not change Init
+
+		if state == 0:			#no module
+			self.list[slotidx] = (_("no module found"), 2, slot)
+		elif state == 1:		#module in init
+			self.list[slotidx] = (_("init module"), 2, slot)
+		elif state == 2:		#module ready
+			#get appname
+			appname = eDVBCI_UI.getInstance().getAppName(slot)
+			self.list[slotidx] = (appname, 2, slot)
+
+		lst = self["entries"]
+		lst.list = self.list
+		lst.l.setList(self.list)
 
 	def ciStateChanged(self, slot):
 		if self.dlg:
@@ -306,15 +355,14 @@ class CiSelection(Screen):
 			if self.state[slot] != state:
 				#print "something happens"
 				self.state[slot] = state
-				self.clearMenu()
-				self.createMenu(slot)
+				self.updateState(slot)
 
 	def dlgClosed(self, slot):
 		self.dlg = None
 
 	def okbuttonClick(self):
 		cur = self["entries"].getCurrent()
-		if cur:
+		if cur and len(cur) > 2:
 			action = cur[1]
 			slot = cur[2]
 			if action == 0:		#reset
@@ -324,13 +372,6 @@ class CiSelection(Screen):
 			elif self.state[slot] == 2:
 				self.dlg = self.session.openWithCallback(self.dlgClosed, CiMmi, slot, action)
 
-		#generate menu / list
-		#list = [ ]
-		#list.append( ("TEXT", "CA-Info") )
-		#list.append( ("TEXT", "Card Status") )
-		#list.append( ("PIN", 6, "Card Pin", 1) )
-		#self.session.open(CiMmi, 0, 0, "Wichtiges CI", "Mainmenu", "Footer", list)
-
 	def cancel(self):
 		CiHandler.unregisterCIMessageHandler(0)
 		self.close()