X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f7e17fd8e9c3afcb4ca28b9770b8e97275e4bd92..6e9093ff8e37f7ec7679a058418e2b494328446c:/lib/python/Screens/InfoBarGenerics.py diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index b27ed48c..7003ed87 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -2,11 +2,9 @@ from ChannelSelection import ChannelSelection, BouquetSelector from Components.ActionMap import ActionMap, HelpableActionMap from Components.ActionMap import NumberActionMap -from Components.BlinkingPixmap import BlinkingPixmapConditional from Components.Harddisk import harddiskmanager from Components.Input import Input from Components.Label import Label -from Components.Pixmap import Pixmap from Components.PluginComponent import plugins from Components.ServiceEventTracker import ServiceEventTracker from Components.Sources.Boolean import Boolean @@ -31,15 +29,17 @@ from Screens.TimeDateInput import TimeDateInput from ServiceReference import ServiceReference from Tools import Notifications -from Tools.Directories import SCOPE_HDD, resolveFilename +from Tools.Directories import SCOPE_HDD, resolveFilename, fileExists from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \ - iPlayableService, eServiceReference, eDVBResourceManager, iFrontendInformation, eEPGCache + iPlayableService, eServiceReference, eEPGCache from time import time, localtime, strftime from os import stat as os_stat from bisect import insort +from RecordTimer import RecordTimerEntry, RecordTimer + # hack alert! from Menu import MainMenu, mdom @@ -348,14 +348,14 @@ class InfoBarMenu: def mainMenu(self): print "loading mainmenu XML..." - menu = mdom.childNodes[0] - assert menu.tagName == "menu", "root element in menu must be 'menu'!" + menu = mdom.getroot() + assert menu.tag == "menu", "root element in menu must be 'menu'!" self.session.infobar = self # so we can access the currently active infobar from screens opened from within the mainmenu # at the moment used from the SubserviceSelection - self.session.openWithCallback(self.mainMenuClosed, MainMenu, menu, menu.childNodes) + self.session.openWithCallback(self.mainMenuClosed, MainMenu, menu) def mainMenuClosed(self, *val): self.session.infobar = None @@ -404,7 +404,7 @@ class InfoBarEPG: self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", { "showEventInfo": (self.openEventView, _("show EPG...")), - "showSingleServiceEPG": (self.openSingleServiceEPG, _("show single service EPG...")), + "showEventInfoPlugin": (self.showEventInfoPlugins, _("show single service EPG...")), "showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible, }) @@ -489,6 +489,23 @@ class InfoBarEPG: ref=self.session.nav.getCurrentlyPlayingServiceReference() self.session.open(EPGSelection, ref) + def showEventInfoPlugins(self): + list = [] + for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EVENTINFO): + list.append((p.name, boundFunction(self.runPlugin, p))) + if len(list): + list.append((_("show single service EPG..."), self.openSingleServiceEPG)) + self.session.openWithCallback(self.EventInfoPluginChosen, ChoiceBox, title=_("Please choose an extension..."), list = list) + else: + self.openSingleServiceEPG() + + def runPlugin(self, plugin): + plugin(session = self.session, servicelist = self.servicelist) + + def EventInfoPluginChosen(self, answer): + if answer is not None: + answer[1]() + def openSimilarList(self, eventid, refstr): self.session.open(EPGSelection, refstr, None, eventid) @@ -730,14 +747,14 @@ class InfoBarSeek: return True def __seekableStatusChanged(self): - print "seekable status changed!" +# print "seekable status changed!" if not self.isSeekable(): self["SeekActions"].setEnabled(False) - print "not seekable, return to play" +# print "not seekable, return to play" self.setSeekState(self.SEEK_STATE_PLAY) else: self["SeekActions"].setEnabled(True) - print "seekable" +# print "seekable" def __serviceStarted(self): self.seekstate = self.SEEK_STATE_PLAY @@ -1014,7 +1031,7 @@ class InfoBarTimeshiftState(InfoBarPVRState): InfoBarPVRState.__init__(self, screen=TimeshiftState) def _mayShow(self): - if self.execing and self.timeshift_enabled: + if self.execing and self.timeshift_enabled and self.seekstate != self.SEEK_STATE_PLAY: self.pvrStateDialog.show() class InfoBarShowMovies: @@ -1170,8 +1187,8 @@ class InfoBarTimeshift: def __seekableStatusChanged(self): enabled = False - print "self.isSeekable", self.isSeekable() - print "self.timeshift_enabled", self.timeshift_enabled +# print "self.isSeekable", self.isSeekable() +# print "self.timeshift_enabled", self.timeshift_enabled # when this service is not seekable, but timeshift # is enabled, this means we can activate @@ -1179,7 +1196,7 @@ class InfoBarTimeshift: if not self.isSeekable() and self.timeshift_enabled: enabled = True - print "timeshift activate:", enabled +# print "timeshift activate:", enabled self["TimeshiftActivateActions"].setEnabled(enabled) def __serviceStarted(self): @@ -1258,7 +1275,6 @@ class InfoBarExtensions: from Tools.BoundFunction import boundFunction # depends on InfoBarExtensions -from Components.PluginComponent import plugins class InfoBarPlugins: def __init__(self): @@ -1276,6 +1292,28 @@ class InfoBarPlugins: def runPlugin(self, plugin): plugin(session = self.session, servicelist = self.servicelist) +from Components.Task import job_manager +class InfoBarJobman: + def __init__(self): + self.addExtension(extension = self.getJobList, type = InfoBarExtensions.EXTENSION_LIST) + + def getJobList(self): + list = [] + for job in job_manager.getPendingJobs(): + list.append(((boundFunction(self.getJobName, job), boundFunction(self.showJobView, job), lambda: True), None)) + return list + + def getJobName(self, job): + return "%s: %s (%d%%)" % (job.getStatustext(), job.name, int(100*job.progress/float(job.end))) + + def showJobView(self, job): + from Screens.TaskView import JobView + job_manager.in_background = False + self.session.openWithCallback(self.JobViewCB, JobView, job) + + def JobViewCB(self, in_background): + job_manager.in_background = in_background + # depends on InfoBarExtensions class InfoBarSleepTimer: def __init__(self): @@ -1356,7 +1394,7 @@ class InfoBarPiP: elif "stop" == use: self.showPiP() -from RecordTimer import parseEvent +from RecordTimer import parseEvent, RecordTimerEntry class InfoBarInstantRecord: """Instant Record - handles the instantRecord action in order to @@ -1389,8 +1427,8 @@ class InfoBarInstantRecord: except: pass - begin = time() - end = time() + 3600 * 10 + begin = int(time()) + end = begin + 3600 # dummy name = "instant record" description = "" eventid = None @@ -1406,11 +1444,33 @@ class InfoBarInstantRecord: if limitEvent: self.session.open(MessageBox, _("No event info found, recording indefinitely."), MessageBox.TYPE_INFO) - data = (begin, end, name, description, eventid) + if isinstance(serviceref, eServiceReference): + serviceref = ServiceReference(serviceref) - recording = self.session.nav.recordWithTimer(serviceref, *data) + recording = RecordTimerEntry(serviceref, begin, end, name, description, eventid, dirname = config.movielist.last_videodir.value) recording.dontSave = True - self.recording.append(recording) + + if event is None or limitEvent == False: + recording.autoincrease = True + if recording.setAutoincreaseEnd(): + self.session.nav.RecordTimer.record(recording) + self.recording.append(recording) + else: + simulTimerList = self.session.nav.RecordTimer.record(recording) + if simulTimerList is not None: # conflict with other recording + name = simulTimerList[1].name + name_date = name + strftime(" %c", localtime(simulTimerList[1].begin)) + print "[TIMER] conflicts with", name_date + recording.autoincrease = True # start with max available length, then increment + if recording.setAutoincreaseEnd(): + self.session.nav.RecordTimer.record(recording) + self.recording.append(recording) + self.session.open(MessageBox, _("Record time limited due to conflicting timer %s") % name_date, MessageBox.TYPE_INFO) + else: + self.session.open(MessageBox, _("Couldn't record due to conflicting timer %s") % name, MessageBox.TYPE_INFO) + recording.autoincrease = False + else: + self.recording.append(recording) def isInstantRecordRunning(self): print "self.recording:", self.recording @@ -1468,6 +1528,8 @@ class InfoBarInstantRecord: if ret[0]: localendtime = localtime(ret[1]) print "stopping recording at", strftime("%c", localendtime) + if self.recording[self.selectedEntry].end != ret[1]: + self.recording[self.selectedEntry].autoincrease = False self.recording[self.selectedEntry].end = ret[1] self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry]) @@ -1479,13 +1541,19 @@ class InfoBarInstantRecord: def inputCallback(self, value): if value is not None: print "stopping recording after", int(value), "minutes." - self.recording[self.selectedEntry].end = time() + 60 * int(value) + if int(value) != 0: + self.recording[self.selectedEntry].autoincrease = False + self.recording[self.selectedEntry].end = int(time()) + 60 * int(value) self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry]) def instantRecord(self): + dir = config.movielist.last_videodir.value + if not fileExists(dir, 'w'): + dir = resolveFilename(SCOPE_HDD) try: - stat = os_stat(resolveFilename(SCOPE_HDD)) + stat = os_stat(dir) except: + # XXX: this message is a little odd as we might be recording to a remote device self.session.open(MessageBox, _("No HDD found or HDD not initialized!"), MessageBox.TYPE_ERROR) return @@ -1520,10 +1588,8 @@ class InfoBarAudioSelection: def audioSelection(self): service = self.session.nav.getCurrentService() - audio = service and service.audioTracks() - self.audioTracks = audio + self.audioTracks = audio = service and service.audioTracks() n = audio and audio.getNumberOfTracks() or 0 - keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n tlist = [] if n > 0: self.audioChannel = service.audioChannel() @@ -1543,21 +1609,45 @@ class InfoBarAudioSelection: tlist.append((description, x)) - selectedAudio = audio.getCurrentTrack() tlist.sort(key=lambda x: x[0]) - selection = 2 + selectedAudio = self.audioTracks.getCurrentTrack() + + selection = 0 + for x in tlist: if x[1] != selectedAudio: selection += 1 else: break - tlist = [([_("Left"), _("Stereo"), _("Right")][self.audioChannel.getCurrentChannel()], "mode"), ("--", "")] + tlist + if SystemInfo["CanDownmixAC3"]: + tlist = [(_("AC3 downmix") + " - " +[_("Off"), _("On")][config.av.downmix_ac3.value and 1 or 0], "CALLFUNC", self.changeAC3Downmix), + ([_("Left"), _("Stereo"), _("Right")][self.audioChannel.getCurrentChannel()], "mode"), + ("--", "")] + tlist + keys = [ "red", "green", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n + selection += 3 + else: + tlist = [([_("Left"), _("Stereo"), _("Right")][self.audioChannel.getCurrentChannel()], "mode"), ("--", "")] + tlist + keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n + selection += 2 self.session.openWithCallback(self.audioSelected, ChoiceBox, title=_("Select audio track"), list = tlist, selection = selection, keys = keys) else: del self.audioTracks + def changeAC3Downmix(self, arg): + choicelist = self.session.current_dialog["list"] + list = choicelist.list + t = list[0][1] + list[0][1]=(t[0], t[1], t[2], t[3], t[4], t[5], t[6], + _("AC3 downmix") + " - " +[_("On"), _("Off")][config.av.downmix_ac3.value and 1 or 0]) + choicelist.setList(list) + if config.av.downmix_ac3.value: + config.av.downmix_ac3.value = False + else: + config.av.downmix_ac3.value = True + config.av.downmix_ac3.save() + def audioSelected(self, audio): if audio is not None: if isinstance(audio[1], str): @@ -1593,16 +1683,18 @@ class InfoBarSubserviceSelection: }, -1) self["SubserviceQuickzapAction"].setEnabled(False) - self.session.nav.event.append(self.checkSubservicesAvail) # we like to get service events + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= + { + iPlayableService.evUpdatedEventInfo: self.checkSubservicesAvail + }) self.bsel = None - def checkSubservicesAvail(self, ev): - if ev == iPlayableService.evUpdatedEventInfo: - service = self.session.nav.getCurrentService() - subservices = service and service.subServices() - if not subservices or subservices.getNumberOfSubservices() == 0: - self["SubserviceQuickzapAction"].setEnabled(False) + def checkSubservicesAvail(self): + service = self.session.nav.getCurrentService() + subservices = service and service.subServices() + if not subservices or subservices.getNumberOfSubservices() == 0: + self["SubserviceQuickzapAction"].setEnabled(False) def nextSubservice(self): self.changeSubservice(+1) @@ -1648,7 +1740,7 @@ class InfoBarSubserviceSelection: tlist.append((i.getName(), i)) if self.bouquets and len(self.bouquets): - keys = ["red", "green", "", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n + keys = ["red", "blue", "", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" ] + [""] * n if config.usage.multibouquet.value: tlist = [(_("Quickzap"), "quickzap", service.subServices()), (_("Add to bouquet"), "CALLFUNC", self.addSubserviceToBouquetCallback), ("--", "")] + tlist else: @@ -1701,8 +1793,11 @@ class InfoBarSubserviceSelection: class InfoBarAdditionalInfo: def __init__(self): - self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0) + self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0 and config.misc.rcused.value == 1) self["TimeshiftPossible"] = self["RecordingPossible"] + self["ShowTimeshiftOnYellow"] = Boolean(fixed=(not config.misc.rcused.value == 0)) + self["ShowAudioOnYellow"] = Boolean(fixed=config.misc.rcused.value == 0) + self["ShowRecordOnRed"] = Boolean(fixed=config.misc.rcused.value == 1) self["ExtensionsAvailable"] = Boolean(fixed=1) class InfoBarNotifications: