X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FCi.py;h=b516ec70a3781eab9fb49deabce2563a012e6f85;hp=9bf5b168bc93a1169bd2832083b3b3a0054c3cc1;hb=0d8132d3512dbf77d817aa8fb6684384155b642e;hpb=663df8b68d461fe8137367977afa7fefc63f1838 diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py index 9bf5b16..b516ec7 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): @@ -22,11 +29,11 @@ class CiMmi(Screen): print "ciMMI with action" + str(action) + self.tag = None self.slotid = slotid - self.Timer = eTimer() - self.Timer.timeout.get().append(self.TimerCheck) - self.Timer.start(1000) + self.timer = eTimer() + self.timer.timeout.get().append(self.keyCancel) #else the skins fails self["title"] = Label("") @@ -56,12 +63,7 @@ class CiMmi(Screen): self.action = action - if action == 0: #reset - eDVBCI_UI.getInstance().setReset(self.slotid) - self.showWait() - elif action == 1: #init - eDVBCI_UI.getInstance().setInit(self.slotid) - elif action == 2: #start MMI + if action == 2: #start MMI eDVBCI_UI.getInstance().startMMI(self.slotid) self.showWait() elif action == 3: #mmi already there (called from infobar) @@ -84,7 +86,9 @@ class CiMmi(Screen): self["bottom"].setText(_("please press OK when ready")) def okbuttonClick(self): - print "ok" + self.timer.stop() + if not self.tag: + return if self.tag == "WAIT": print "do nothing - wait" elif self.tag == "MENU": @@ -109,11 +113,13 @@ class CiMmi(Screen): self.showWait() def closeMmi(self): - self.Timer.stop() - self.close() + self.timer.stop() + self.close(self.slotid) def keyCancel(self): - print "keyCancel" + self.timer.stop() + if not self.tag: + return if self.tag == "WAIT": eDVBCI_UI.getInstance().stopMMI(self.slotid) self.closeMmi() @@ -129,18 +135,22 @@ class CiMmi(Screen): print "give cancel action to ci" def keyConfigEntry(self, key): + self.timer.stop() try: self["entries"].handleKey(key) - except AttributeError: + except: pass def keyNumberGlobal(self, number): + self.timer.stop() self.keyConfigEntry(config.key[str(number)]) def keyLeft(self): + self.timer.stop() self.keyConfigEntry(config.key["prevElement"]) def keyRight(self): + self.timer.stop() self.keyConfigEntry(config.key["nextElement"]) def updateList(self, list): @@ -151,7 +161,7 @@ class CiMmi(Screen): List.l.setList(list) return - if self.tag == "ENQ": + if self.tag and self.tag == "ENQ": type = TYPE_CONFIG else: type = TYPE_MENU @@ -180,23 +190,30 @@ class CiMmi(Screen): list = [ ] - self.tag = screen[0][0] - - for entry in screen: - if entry[0] == "PIN": - self.addEntry(list, entry) + self.timer.stop() + if len(screen) > 0 and screen[0][0] == "CLOSE": + timeout = screen[0][1] + if timeout > 0: + self.timer.start(timeout*1000, True) else: - if entry[0] == "TITLE": - self["title"].setText(entry[1]) - elif entry[0] == "SUBTITLE": - self["subtitle"].setText(entry[1]) - elif entry[0] == "BOTTOM": - self["bottom"].setText(entry[1]) - elif entry[0] == "TEXT": + self.keyCancel() + else: + self.tag = screen[0][0] + for entry in screen: + if entry[0] == "PIN": self.addEntry(list, entry) - self.updateList(list) - - def TimerCheck(self): + else: + if entry[0] == "TITLE": + self["title"].setText(entry[1]) + elif entry[0] == "SUBTITLE": + self["subtitle"].setText(entry[1]) + elif entry[0] == "BOTTOM": + self["bottom"].setText(entry[1]) + elif entry[0] == "TEXT": + self.addEntry(list, entry) + self.updateList(list) + + def ciStateChanged(self): if self.action == 0: #reset self.closeMmi() if self.action == 1: #init @@ -210,73 +227,151 @@ class CiMmi(Screen): if eDVBCI_UI.getInstance().getMMIState(self.slotid) != 1: self.closeMmi() - if eDVBCI_UI.getInstance().availableMMI(self.slotid) == 1: + if self.action > 1 and eDVBCI_UI.getInstance().availableMMI(self.slotid) == 1: self.showScreen() #FIXME: check for mmi-session closed -class CiSelection(Screen): - def createMenu(self): - self.list = [ ] - self.list.append( (_("Reset"), 0) ) - self.list.append( (_("Init"), 1) ) - - self.state = eDVBCI_UI.getInstance().getState(0) - if self.state == 0: #no module - self.list.append( (_("no module found"), 2) ) - elif self.state == 1: #module in init - self.list.append( (_("init module"), 2) ) - elif self.state == 2: #module ready - #get appname - appname = eDVBCI_UI.getInstance().getAppName(0) - self.list.append( (appname, 2) ) - - self["entries"].list = self.list - self["entries"].l.setList(self.list) - - def TimerCheck(self): - state = eDVBCI_UI.getInstance().getState(0) - if self.state != state: - #print "something happens" - self.state = state - self.createMenu() - - def okbuttonClick(self): - self.slot = 0 - - if self.state == 2: - self.session.open(CiMmi, 0, self["entries"].getCurrent()[1]) +class CiMessageHandler: + def __init__(self): + self.session = None + self.ci = { } + self.dlgs = { } + eDVBCI_UI.getInstance().ciStateChanged.get().append(self.ciStateChanged) - #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 setSession(self, session): + self.session = session - def cancel(self): - self.Timer.stop() - self.close() + def ciStateChanged(self, slot): + if slot in self.ci: + self.ci[slot](slot) + else: + if slot in self.dlgs: + 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" + + def dlgClosed(self, slot): + del self.dlgs[slot] + + def registerCIMessageHandler(self, slot, func): + self.unregisterCIMessageHandler(slot) + self.ci[slot] = func - def mmiAvail(self, slot): - print "mmi avail slot", slot + def unregisterCIMessageHandler(self, slot): + if slot in self.ci: + del self.ci[slot] +CiHandler = CiMessageHandler() + +class CiSelection(Screen): def __init__(self, session): - #FIXME support for one ci only 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.createMenu() - self.Timer = eTimer() - self.Timer.timeout.get().append(self.TimerCheck) - self.Timer.start(1000) + 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) + + 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) ) + + 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) + + def ciStateChanged(self, slot): + if self.dlg: + self.dlg.ciStateChanged() + else: + state = eDVBCI_UI.getInstance().getState(slot) + if self.state[slot] != state: + #print "something happens" + self.state[slot] = state + self.updateState(slot) - eDVBCI_UI.getInstance().mmiAvail.get().append(self.mmiAvail) + 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 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) + + def cancel(self): + CiHandler.unregisterCIMessageHandler(0) + self.close()