"openServiceList": (self.openServiceList, _("open service list")),
})
+ def showTvChannelList(self, zap=False):
+ self.servicelist.setModeTv()
+ if zap:
+ self.servicelist.zap()
+ self.session.execDialog(self.servicelist)
+
+ def showRadioChannelList(self, zap=False):
+ self.servicelist.setModeRadio()
+ if zap:
+ self.servicelist.zap()
+ self.session.execDialog(self.servicelist)
+
def firstRun(self):
self.onShown.remove(self.firstRun)
config.misc.initialchannelselection.value = 0
class InfoBarExtensions:
def __init__(self):
- self.pipshown = False
+ self.session.pipshown = False
self["InstantExtensionsActions"] = HelpableActionMap(self, "InfobarExtensions",
{
def extensions(self):
list = []
- if self.pipshown == False:
+ if self.session.pipshown == False:
list.append((_("Activate Picture in Picture"), self.PIPON))
- elif self.pipshown == True:
+ elif self.session.pipshown == True:
list.append((_("Disable Picture in Picture"), self.PIPOFF))
list.append((_("Move Picture in Picture"), self.MOVEPIP))
list.append((_("Swap services"), self.PIPSWAP))
def extensionCallback(self, answer):
if answer is not None:
if answer[1] == self.PIPON:
- self.pip = self.session.instantiateDialog(PictureInPicture)
-
+ self.session.pip = self.session.instantiateDialog(PictureInPicture)
newservice = self.session.nav.getCurrentlyPlayingServiceReference()
-
- if self.pip.playService(newservice):
- self.pipshown = True
+ if self.session.pip.playService(newservice):
+ self.session.pipshown = True
+ self.session.pip.servicePath = self.servicelist.getCurrentServicePath()
else:
- self.pipshown = False
- del self.pip
+ self.session.pipshown = False
+ del self.session.pip
self.session.nav.playService(newservice)
elif answer[1] == self.PIPOFF:
- del self.pip
- self.pipshown = False
+ del self.session.pip
+ self.session.pipshown = False
elif answer[1] == self.PIPSWAP:
- swapservice = self.pip.getCurrentService()
- self.pip.playService(self.session.nav.getCurrentlyPlayingServiceReference())
- self.session.nav.playService(swapservice)
-
+ swapservice = self.session.nav.getCurrentlyPlayingServiceReference()
+ if self.session.pip.servicePath:
+ servicepath = self.servicelist.getCurrentServicePath()
+ ref=servicepath[len(servicepath)-1]
+ pipref=self.session.pip.getCurrentService()
+ self.session.pip.playService(swapservice)
+ self.servicelist.setCurrentServicePath(self.session.pip.servicePath)
+ if pipref.toString() != ref.toString(): # is a subservice ?
+ self.session.nav.stopService() # stop portal
+ self.session.nav.playService(pipref) # start subservice
+ self.session.pip.servicePath=servicepath
elif answer[1] == self.MOVEPIP:
- self.session.open(PiPSetup, pip = self.pip)
+ self.session.open(PiPSetup, pip = self.session.pip)
elif answer[1] == self.ENABLE_SUBTITLE:
self.selected_subtitle = answer[2]
self.subtitles_enabled = True
if entry is not None and entry != -1:
self.session.nav.RecordTimer.removeEntry(self.recording[entry])
self.recording.remove(self.recording[entry])
-
+
def startInstantRecording(self, limitEvent = False):
serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
def audioSelection(self):
service = self.session.nav.getCurrentService()
- audio = service.audioTracks()
+ audio = service and service.audioTracks()
self.audioTracks = audio
- n = audio.getNumberOfTracks()
+ n = audio and audio.getNumberOfTracks()
keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n
tlist = []
print "tlist:", tlist
- if n > 0:
+ if n and n > 0:
self.audioChannel = service.audioChannel()
for x in range(n):
class InfoBarAdditionalInfo:
def __init__(self):
+ self["NimA"] = Pixmap()
+ self["NimB"] = Pixmap()
+ self["TextActive"] = Pixmap()
self["DolbyActive"] = Pixmap()
self["CryptActive"] = Pixmap()
self["FormatActive"] = Pixmap()
-
+ self["NimA_Active"] = Pixmap()
+ self["NimB_Active"] = Pixmap()
+
self["ButtonRed"] = PixmapConditional(withTimer = False)
self["ButtonRed"].setConnect(lambda: harddiskmanager.HDDCount() > 0)
self.onLayoutFinish.append(self["ButtonRed"].update)
self.onLayoutFinish.append(self["ButtonBlueText"].update)
self.session.nav.event.append(self.gotServiceEvent) # we like to get service events
+ res_mgr = eDVBResourceManagerPtr()
+ if eDVBResourceManager.getInstance(res_mgr) == 0:
+ res_mgr.frontendUseMaskChanged.get().append(self.tunerUseMaskChanged)
+
+ def tunerUseMaskChanged(self, mask):
+ if mask&1:
+ self["NimA_Active"].show()
+ else:
+ self["NimA_Active"].hide()
+ if mask&2:
+ self["NimB_Active"].show()
+ else:
+ self["NimB_Active"].hide()
def hideSubServiceIndication(self):
self["ButtonGreen"].hide()
def checkFormat(self, service):
info = service.info()
- if info is not None:
+ if info:
aspect = info.getInfo(iServiceInformation.sAspect)
if aspect in [ 3, 4, 7, 8, 0xB, 0xC, 0xF, 0x10 ]:
self["FormatActive"].show()
- else:
- self["FormatActive"].hide()
+ return
+ self["FormatActive"].hide()
+
+ def checkText(self, service):
+ info = service.info()
+ if info:
+ tpid = info.getInfo(iServiceInformation.sTXTPID)
+ if tpid != -1:
+ self["TextActive"].show()
+ return
+ self["TextActive"].hide()
def checkSubservices(self, service):
- if service.subServices().getNumberOfSubservices() > 0:
+ subservices = service.subServices()
+ if subservices and subservices.getNumberOfSubservices() > 0:
self.showSubServiceIndication()
else:
self.hideSubServiceIndication()
# FIXME
dolby = False
audio = service.audioTracks()
- if audio is not None:
+ if audio:
n = audio.getNumberOfTracks()
for x in range(n):
i = audio.getTrackInfo(x)
def checkCrypted(self, service):
info = service.info()
- if info is not None:
- if info.getInfo(iServiceInformation.sIsCrypted) > 0:
- self["CryptActive"].show()
- else:
- self["CryptActive"].hide()
+ if info and info.getInfo(iServiceInformation.sIsCrypted) > 0:
+ self["CryptActive"].show()
+ else:
+ self["CryptActive"].hide()
+
+ def checkTunerState(self, service):
+ info = service.frontendInfo()
+ feNumber = info and info.getFrontendInfo(iFrontendInformation.frontendNumber)
+ if feNumber is None:
+ self["NimA"].hide()
+ self["NimB"].hide()
+ elif feNumber == 0:
+ self["NimB"].hide()
+ self["NimA"].show()
+ elif feNumber == 1:
+ self["NimA"].hide()
+ self["NimB"].show()
def gotServiceEvent(self, ev):
service = self.session.nav.getCurrentService()
- if ev == iPlayableService.evUpdatedEventInfo:
+ if ev == iPlayableService.evStart:
+ self.checkTunerState(service)
+ elif ev == iPlayableService.evUpdatedEventInfo:
self.checkSubservices(service)
self.checkFormat(service)
elif ev == iPlayableService.evUpdatedInfo:
self.checkCrypted(service)
self.checkDolby(service)
+ self.checkText(service)
elif ev == iPlayableService.evEnd:
self.hideSubServiceIndication()
self["CryptActive"].hide()
self["DolbyActive"].hide()
self["FormatActive"].hide()
+ self["TextActive"].hide()
class InfoBarNotifications:
def __init__(self):
git.cweiske.de / enigma2.git / blobdiff