-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.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, ConfigNothing, ConfigPIN
from Components.ConfigList import ConfigList
-from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent
+from Components.SystemInfo import SystemInfo
+
+from enigma import eTimer, eDVBCI_UI, eDVBCIInterfaces
MAX_NUM_CI = 4
config.ci.append(ConfigSubsection())
config.ci[slot].canDescrambleMultipleServices = ConfigSelection(choices = [("auto", _("Auto")), ("no", _("No")), ("yes", _("Yes"))], default = "auto")
-class CiMmi(Screen):
- def __init__(self, session, slotid, action):
+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.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()
print "answer MENU"
cur = self["entries"].getCurrent()
if cur:
- eDVBCI_UI.getInstance().answerMenu(self.slotid, cur[2])
+ 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":
cur = self["entries"].getCurrent()
answer = str(cur[1].value)
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):
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 == "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()
self["subtitle"].setText("")
self["bottom"].setText("")
list = [ ]
- list.append( (_("wait for ci..."), ConfigNothing()) )
+ 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":
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):
self.ci = { }
self.dlgs = { }
eDVBCI_UI.getInstance().ciStateChanged.get().append(self.ciStateChanged)
+ SystemInfo["CommonInterface"]= eDVBCIInterfaces.getInstance().getNumOfSlots() > 0
def setSession(self, session):
self.session = session
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)
class CiSelection(Screen):
def __init__(self, session):
Screen.__init__(self, session)
-
self["actions"] = ActionMap(["OkCancelActions", "CiSelectionActions"],
{
"left": self.keyLeft,
menuList.list = self.list
menuList.l.setList(self.list)
self["entries"] = menuList
+ self["entries"].onSelectionChanged.append(self.selectionChanged)
+ self["text"] = Label(_("Slot %d")%(1))
+
+ def selectionChanged(self):
+ cur_idx = self["entries"].getCurrentIndex()
+ self["text"].setText(_("Slot %d")%((cur_idx / 4)+1))
def keyConfigEntry(self, key):
try:
self.state[slot] = state
slotidx=0
- while self.list[slotidx][2] != slot:
+ while len(self.list[slotidx]) < 3 or self.list[slotidx][3] != slot:
slotidx += 1
slotidx += 1 # do not change Reset
elif action == 1: #init
eDVBCI_UI.getInstance().setInit(slot)
elif self.state[slot] == 2:
- self.dlg = self.session.openWithCallback(self.dlgClosed, CiMmi, slot, action)
+ self.dlg = self.session.openWithCallback(self.dlgClosed, MMIDialog, slot, action)
def cancel(self):
- CiHandler.unregisterCIMessageHandler(0)
+ for slot in range(MAX_NUM_CI):
+ state = eDVBCI_UI.getInstance().getState(slot)
+ if state != -1:
+ CiHandler.unregisterCIMessageHandler(slot)
self.close()
git.cweiske.de / enigma2.git / blobdiff