X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FCi.py;h=cf65cfb0a5cf3d6366f32f5d6daac2b586b97a33;hp=b516ec70a3781eab9fb49deabce2563a012e6f85;hb=HEAD;hpb=0d8132d3512dbf77d817aa8fb6684384155b642e diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py index b516ec7..cf65cfb 100644 --- a/lib/python/Screens/Ci.py +++ b/lib/python/Screens/Ci.py @@ -1,46 +1,65 @@ -from Screen import * -from Components.MenuList import MenuList +from Screen import Screen from Components.ActionMap import ActionMap from Components.ActionMap import NumberActionMap -from Components.Header import Header -from Components.Button import Button from Components.Label import Label -from Components.HTMLComponent import * -from Components.GUIComponent import * -from Components.config import * +from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, ConfigNothing, ConfigPIN, ConfigYesNo from Components.ConfigList import ConfigList -from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent +from Components.SystemInfo import SystemInfo +from Tools.Directories import fileExists -TYPE_MENU = 0 -TYPE_CONFIG = 1 -MAX_NUM_CI = 4 +from enigma import eTimer, eDVBCI_UI, eDVBCIInterfaces -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")))) +def setCIBitrate(configElement): + eDVBCI_UI.getInstance().setClockRate(configElement.slotid, eDVBCI_UI.rateHigh if configElement.value else eDVBCI_UI.rateNormal) + +def setRelevantPidsRouting(configElement): + open(SystemInfo["CI%dRelevantPidsRoutingSupport" % configElement.slotid], "w").write("yes" if configElement.value else "no") + +def setdvbCiDelay(configElement): + open(SystemInfo["CommonInterfaceCIDelay"], "w").write(configElement.value) + configElement.save() -class CiMmi(Screen): - def __init__(self, session, slotid, action): +def InitCiConfig(): + config.ci = ConfigSubList() + config.cimisc = ConfigSubsection() + if SystemInfo["CommonInterface"]: + for slot in range(SystemInfo["CommonInterface"]): + config.ci.append(ConfigSubsection()) + config.ci[slot].canDescrambleMultipleServices = ConfigSelection(choices = [("auto", _("Auto")), ("no", _("No")), ("yes", _("Yes"))], default = "auto") + if SystemInfo["CI%dSupportsHighBitrates" % slot]: + config.ci[slot].canHandleHighBitrates = ConfigYesNo(default = False) + config.ci[slot].canHandleHighBitrates.slotid = slot + config.ci[slot].canHandleHighBitrates.addNotifier(setCIBitrate) + + if SystemInfo["CI%dRelevantPidsRoutingSupport" % slot]: + config.ci[slot].relevantPidsRouting = ConfigYesNo(default = False) + config.ci[slot].relevantPidsRouting.slotid = slot + config.ci[slot].relevantPidsRouting.addNotifier(setRelevantPidsRouting) + + if SystemInfo["CommonInterfaceCIDelay"]: + config.cimisc.dvbCiDelay = ConfigSelection(default = "256", choices = [("16"), ("32"), ("64"), ("128"), ("256")]) + config.cimisc.dvbCiDelay.addNotifier(setdvbCiDelay) + +class MMIDialog(Screen): + def __init__(self, session, slotid, action, handler = eDVBCI_UI.getInstance(), wait_text = _("wait for ci...") ): Screen.__init__(self, session) - print "ciMMI with action" + str(action) + print "MMIDialog with action" + str(action) + self.mmiclosed = False self.tag = None self.slotid = slotid self.timer = eTimer() - self.timer.timeout.get().append(self.keyCancel) + self.timer.callback.append(self.keyCancel) #else the skins fails self["title"] = Label("") self["subtitle"] = Label("") self["bottom"] = Label("") self["entries"] = ConfigList([ ]) - self.listtype = TYPE_CONFIG self["actions"] = NumberActionMap(["SetupActions"], { @@ -63,26 +82,28 @@ class CiMmi(Screen): self.action = action + self.handler = handler + self.wait_text = wait_text + if action == 2: #start MMI - eDVBCI_UI.getInstance().startMMI(self.slotid) + handler.startMMI(self.slotid) self.showWait() elif action == 3: #mmi already there (called from infobar) self.showScreen() def addEntry(self, list, entry): if entry[0] == "TEXT": #handle every item (text / pin only?) - list.append( (entry[1], entry[2]) ) + list.append( (entry[1], ConfigNothing(), entry[2]) ) if entry[0] == "PIN": - self.pinlength = entry[1] + pinlength = entry[1] if entry[3] == 1: # masked pins: - x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, "*"))) - else: + x = ConfigPIN(0, len = pinlength, censor = "*") + else: # unmasked pins: - x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (self.pinlength, ""))) + x = ConfigPIN(0, len = pinlength) self["subtitle"].setText(entry[2]) - self.pin = getConfigListEntry("",x) - list.append( self.pin ) + list.append( getConfigListEntry("", x) ) self["bottom"].setText(_("please press OK when ready")) def okbuttonClick(self): @@ -95,21 +116,22 @@ class CiMmi(Screen): print "answer MENU" cur = self["entries"].getCurrent() if cur: - eDVBCI_UI.getInstance().answerMenu(self.slotid, cur[1]) + self.handler.answerMenu(self.slotid, cur[2]) else: - eDVBCI_UI.getInstance().answerMenu(self.slotid, 0) - self.showWait() + self.handler.answerMenu(self.slotid, 0) + self.showWait() elif self.tag == "LIST": print "answer LIST" - eDVBCI_UI.getInstance().answerMenu(self.slotid, 0) - self.showWait() + self.handler.answerMenu(self.slotid, 0) + self.showWait() elif self.tag == "ENQ": - answer = str(self.pin[1].parent.value[0]) + cur = self["entries"].getCurrent() + answer = str(cur[1].value) length = len(answer) - while length < self.pinlength: + while length < cur[1].getLength(): answer = '0'+answer length+=1 - eDVBCI_UI.getInstance().answerEnq(self.slotid, answer) + self.handler.answerEnq(self.slotid, answer) self.showWait() def closeMmi(self): @@ -118,21 +140,21 @@ class CiMmi(Screen): def keyCancel(self): self.timer.stop() - if not self.tag: - return - if self.tag == "WAIT": - eDVBCI_UI.getInstance().stopMMI(self.slotid) + if not self.tag or self.mmiclosed: self.closeMmi() - elif self.tag in [ "MENU", "LIST" ]: + elif self.tag == "WAIT": + self.handler.stopMMI(self.slotid) + self.closeMmi() + elif self.tag in ( "MENU", "LIST" ): print "cancel list" - eDVBCI_UI.getInstance().answerMenu(self.slotid, 0) + self.handler.answerMenu(self.slotid, 0) self.showWait() elif self.tag == "ENQ": print "cancel enq" - eDVBCI_UI.getInstance().cancelEnq(self.slotid) + self.handler.cancelEnq(self.slotid) self.showWait() else: - print "give cancel action to ci" + print "give cancel action to ci" def keyConfigEntry(self, key): self.timer.stop() @@ -143,37 +165,22 @@ class CiMmi(Screen): def keyNumberGlobal(self, number): self.timer.stop() - self.keyConfigEntry(config.key[str(number)]) + self.keyConfigEntry(KEY_0 + number) def keyLeft(self): self.timer.stop() - self.keyConfigEntry(config.key["prevElement"]) + self.keyConfigEntry(KEY_LEFT) def keyRight(self): self.timer.stop() - self.keyConfigEntry(config.key["nextElement"]) + self.keyConfigEntry(KEY_RIGHT) def updateList(self, list): List = self["entries"] try: List.instance.moveSelectionTo(0) except: - List.l.setList(list) - return - - if self.tag and self.tag == "ENQ": - type = TYPE_CONFIG - else: - type = TYPE_MENU - - if type != self.listtype: - if type == TYPE_CONFIG: - List.l = eListboxPythonConfigContent() - else: - List.l = eListboxPythonStringContent() - List.instance.setContent(List.l) - self.listtype = type - + pass List.l.setList(list) def showWait(self): @@ -182,22 +189,24 @@ class CiMmi(Screen): self["subtitle"].setText("") self["bottom"].setText("") list = [ ] - list.append( ("wait for ci...", 0) ) + list.append( (self.wait_text, ConfigNothing()) ) self.updateList(list) def showScreen(self): - screen = eDVBCI_UI.getInstance().getMMIScreen(self.slotid) - + screen = self.handler.getMMIScreen(self.slotid) + list = [ ] self.timer.stop() if len(screen) > 0 and screen[0][0] == "CLOSE": timeout = screen[0][1] + self.mmiclosed = True if timeout > 0: self.timer.start(timeout*1000, True) else: self.keyCancel() else: + self.mmiclosed = False self.tag = screen[0][0] for entry in screen: if entry[0] == "PIN": @@ -214,23 +223,26 @@ class CiMmi(Screen): self.updateList(list) def ciStateChanged(self): + do_close = False if self.action == 0: #reset - self.closeMmi() + do_close = True if self.action == 1: #init - self.closeMmi() + do_close = True - #module still there ? - if eDVBCI_UI.getInstance().getState(self.slotid) != 2: - self.closeMmi() + #module still there ? + if self.handler.getState(self.slotid) != 2: + do_close = True - #mmi session still active ? - if eDVBCI_UI.getInstance().getMMIState(self.slotid) != 1: - self.closeMmi() + #mmi session still active ? + if self.handler.getMMIState(self.slotid) != 1: + do_close = True - if self.action > 1 and eDVBCI_UI.getInstance().availableMMI(self.slotid) == 1: + if do_close: + self.closeMmi() + elif self.action > 1 and self.handler.availableMMI(self.slotid) == 1: self.showScreen() - #FIXME: check for mmi-session closed + #FIXME: check for mmi-session closed class CiMessageHandler: def __init__(self): @@ -250,12 +262,11 @@ class CiMessageHandler: self.dlgs[slot].ciStateChanged() elif eDVBCI_UI.getInstance().availableMMI(slot) == 1: if self.session: - self.dlgs[slot] = self.session.openWithCallback(self.dlgClosed, CiMmi, slot, 3) - else: - print "no session" + self.dlgs[slot] = self.session.openWithCallback(self.dlgClosed, MMIDialog, slot, 3) def dlgClosed(self, slot): - del self.dlgs[slot] + if slot in self.dlgs: + del self.dlgs[slot] def registerCIMessageHandler(self, slot, func): self.unregisterCIMessageHandler(slot) @@ -270,7 +281,6 @@ CiHandler = CiMessageHandler() class CiSelection(Screen): def __init__(self, session): Screen.__init__(self, session) - self["actions"] = ActionMap(["OkCancelActions", "CiSelectionActions"], { "left": self.keyLeft, @@ -281,71 +291,94 @@ class CiSelection(Screen): self.dlg = None self.state = { } - self.list = [ ] + self.slots = [] + self.HighBitrateEntry = {} + self.RelevantPidsRoutingEntry = {} - for slot in range(MAX_NUM_CI): + self.entryData = [] + self.DVBCiDelayEntry = None + + self.list = [ ] + self["entries"] = ConfigList(self.list) + self["entries"].list = self.list + self["entries"].l.setList(self.list) + self["text"] = Label(_("Slot %d")%(1)) + self.onLayoutFinish.append(self.initialUpdate) + + def initialUpdate(self): + for slot in range(SystemInfo["CommonInterface"]): state = eDVBCI_UI.getInstance().getState(slot) if state != -1: - self.appendEntries(slot, state) + self.slots.append(slot) + self.state[slot] = state + self.createEntries(slot) CiHandler.registerCIMessageHandler(slot, self.ciStateChanged) - menuList = ConfigList(list) - menuList.list = self.list - menuList.l.setList(self.list) - self["entries"] = menuList + self.slots.sort() + self.updateEntries() + if self.slots: + self["text"].setText(_("Slot %d")% (int(self.slots[0])+1)) + + def selectionChanged(self): + entryData = self.entryData[self["entries"].getCurrentIndex()] + self["text"].setText(_("Slot %d")%(entryData[1] + 1)) def keyConfigEntry(self, key): + current = self["entries"].getCurrent() try: self["entries"].handleKey(key) - self["entries"].getCurrent()[1].save() + current[1].save() except: pass def keyLeft(self): - self.keyConfigEntry(config.key["prevElement"]) + self.keyConfigEntry(KEY_LEFT) 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) ) - - if self.state[slot] == 0: #no module - self.list.append( (_("no module found"), 2, slot) ) - elif self.state[slot] == 1: #module in init - self.list.append( (_("init module"), 2, slot) ) - elif self.state[slot] == 2: #module ready - #get appname - appname = eDVBCI_UI.getInstance().getAppName(slot) - self.list.append( (appname, 2, slot) ) - - 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) + self.keyConfigEntry(KEY_RIGHT) + + def createEntries(self, slot): + if SystemInfo["CI%dSupportsHighBitrates" % slot]: + self.HighBitrateEntry[slot] = getConfigListEntry(_("High bitrate support"), config.ci[slot].canHandleHighBitrates) + if SystemInfo["CI%dRelevantPidsRoutingSupport" % slot]: + self.RelevantPidsRoutingEntry[slot] = getConfigListEntry(_("PID Filtering"), config.ci[slot].relevantPidsRouting) + if SystemInfo["CommonInterfaceCIDelay"] and self.DVBCiDelayEntry is None: + self.DVBCiDelayEntry = getConfigListEntry(_("DVB CI Delay"), config.cimisc.dvbCiDelay) + + def addToList(self, data, action, slotid): + self.list.append(data) + self.entryData.append((action, slotid)) + + def updateEntries(self): + self.list = [] + self.entryData = [] + + for slot in self.slots: + self.addToList((_("Reset"), ConfigNothing()), 0, slot) + self.addToList((_("Init"), ConfigNothing()), 1, slot) + + if self.state[slot] == 0: #no module + self.addToList((_("no module found"), ConfigNothing()), 2, slot) + elif self.state[slot] == 1: #module in init + self.addToList((_("init module"), ConfigNothing()), 2, slot) + elif self.state[slot] == 2: #module ready + #get appname + appname = eDVBCI_UI.getInstance().getAppName(slot) + self.addToList((appname, ConfigNothing()), 2, slot) + + self.addToList(getConfigListEntry(_("Multiple service support"), config.ci[slot].canDescrambleMultipleServices), -1, slot) + + if SystemInfo["CI%dSupportsHighBitrates" % slot]: + self.addToList(self.HighBitrateEntry[slot], -1, slot) + if SystemInfo["CI%dRelevantPidsRoutingSupport" % slot]: + self.addToList(self.RelevantPidsRoutingEntry[slot], -1, slot) + if SystemInfo["CommonInterfaceCIDelay"]: + self.addToList(self.DVBCiDelayEntry, -1, slot) + + self["entries"].list = self.list + self["entries"].l.setList(self.list) + if self.selectionChanged not in self["entries"].onSelectionChanged: + self["entries"].onSelectionChanged.append(self.selectionChanged) def ciStateChanged(self, slot): if self.dlg: @@ -355,23 +388,28 @@ class CiSelection(Screen): if self.state[slot] != state: #print "something happens" self.state[slot] = state - self.updateState(slot) + self.updateEntries() def dlgClosed(self, slot): self.dlg = None def okbuttonClick(self): cur = self["entries"].getCurrent() - if cur and len(cur) > 2: - action = cur[1] - slot = cur[2] + if cur: + idx = self["entries"].getCurrentIndex() + entryData = self.entryData[idx] + action = entryData[0] + slot = entryData[1] if action == 0: #reset eDVBCI_UI.getInstance().setReset(slot) elif action == 1: #init eDVBCI_UI.getInstance().setInit(slot) - elif self.state[slot] == 2: - self.dlg = self.session.openWithCallback(self.dlgClosed, CiMmi, slot, action) + elif action == 2 and self.state[slot] == 2: + self.dlg = self.session.openWithCallback(self.dlgClosed, MMIDialog, slot, action) def cancel(self): - CiHandler.unregisterCIMessageHandler(0) + for slot in range(SystemInfo["CommonInterface"]): + state = eDVBCI_UI.getInstance().getState(slot) + if state != -1: + CiHandler.unregisterCIMessageHandler(slot) self.close()