X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/14490ab8fe9c3eeb2e9f40da4b2e70f519357e63..d838e8b3d85b0f0d1777b1ddc4f7bd9fefefddd6:/lib/python/Screens/InfoBarGenerics.py diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index ef014568..7d597030 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -5,10 +5,9 @@ from Components.ActionMap import NumberActionMap from Components.BlinkingPixmap import BlinkingPixmapConditional from Components.Harddisk import harddiskmanager from Components.Input import Input -from Components.Label import * -from Components.Pixmap import Pixmap, PixmapConditional +from Components.Label import Label +from Components.Pixmap import Pixmap from Components.PluginComponent import plugins -from Components.ProgressBar import * from Components.ServiceEventTracker import ServiceEventTracker from Components.Sources.CurrentService import CurrentService from Components.Sources.EventInfo import EventInfo @@ -16,8 +15,7 @@ from Components.Sources.FrontendStatus import FrontendStatus from Components.Sources.Boolean import Boolean from Components.Sources.Clock import Clock from Components.TimerList import TimerEntryComponent -from Components.config import config, ConfigBoolean - +from Components.config import config, ConfigBoolean, ConfigClock from EpgSelection import EPGSelection from Plugins.Plugin import PluginDescriptor @@ -33,6 +31,7 @@ from Screens.PictureInPicture import PictureInPicture from Screens.SubtitleDisplay import SubtitleDisplay from Screens.RdsDisplay import RdsInfoDisplay, RassInteractive from Screens.SleepTimerEdit import SleepTimerEdit +from Screens.TimeDateInput import TimeDateInput from ServiceReference import ServiceReference from Tools import Notifications @@ -41,7 +40,7 @@ from Tools.Directories import SCOPE_HDD, resolveFilename from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \ iPlayableService, eServiceReference, eDVBResourceManager, iFrontendInformation, eEPGCache -from time import time +from time import time, localtime, strftime from os import stat as os_stat from bisect import insort @@ -60,7 +59,7 @@ class InfoBarShowHide: STATE_HIDING = 1 STATE_SHOWING = 2 STATE_SHOWN = 3 - + def __init__(self): self["ShowHideActions"] = ActionMap( ["InfobarShowHideActions"] , { @@ -70,42 +69,28 @@ class InfoBarShowHide: self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { - iPlayableService.evStart: self.__serviceStarted, - iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged + iPlayableService.evStart: self.serviceStarted, }) self.__state = self.STATE_SHOWN self.__locked = 0 - + self.hideTimer = eTimer() self.hideTimer.timeout.get().append(self.doTimerHide) self.hideTimer.start(5000, True) - + self.onShow.append(self.__onShow) self.onHide.append(self.__onHide) - self.current_begin_time=0 - - def __eventInfoChanged(self): - if self.execing: - service = self.session.nav.getCurrentService() - old_begin_time = self.current_begin_time - info = service and service.info() - ptr = info and info.getEvent(0) - self.current_begin_time = ptr and ptr.getBeginTime() or 0 - if config.usage.show_infobar_on_event_change.value: - if old_begin_time and old_begin_time != self.current_begin_time: - self.doShow() - def __serviceStarted(self): + def serviceStarted(self): if self.execing: - self.current_begin_time=0 if config.usage.show_infobar_on_zap.value: self.doShow() def __onShow(self): self.__state = self.STATE_SHOWN self.startHideTimer() - + def startHideTimer(self): if self.__state == self.STATE_SHOWN and not self.__locked: idx = config.usage.infobar_timeout.index @@ -136,7 +121,7 @@ class InfoBarShowHide: if self.execing: self.show() self.hideTimer.stop() - + def unlockShow(self): self.__locked = self.__locked - 1 if self.execing: @@ -145,7 +130,7 @@ class InfoBarShowHide: # def startShow(self): # self.instance.m_animation.startMoveAnimation(ePoint(0, 600), ePoint(0, 380), 100) # self.__state = self.STATE_SHOWN -# +# # def startHide(self): # self.instance.m_animation.startMoveAnimation(ePoint(0, 380), ePoint(0, 600), 100) # self.__state = self.STATE_HIDDEN @@ -269,7 +254,7 @@ class InfoBarChannelSelection: def __init__(self): #instantiate forever self.servicelist = self.session.instantiateDialog(ChannelSelection) - + if config.misc.initialchannelselection.value: self.onShown.append(self.firstRun) @@ -315,7 +300,7 @@ class InfoBarChannelSelection: def switchChannelDown(self): self.servicelist.moveDown() self.session.execDialog(self.servicelist) - + def openServiceList(self): self.session.execDialog(self.servicelist) @@ -420,8 +405,17 @@ class InfoBarEPG: self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", { "showEventInfo": (self.openEventView, _("show EPG...")), + "showSingleServiceEPG": (self.openSingleServiceEPG, _("show single service EPG...")), + "showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible, }) + def showEventInfoWhenNotVisible(self): + if self.shown: + self.openEventView() + else: + self.toggleShow() + return 1 + def zapToService(self, service): if not service is None: if self.servicelist.getRoot() != self.epg_bouquet: #already in correct bouquet? @@ -561,13 +555,13 @@ class InfoBarRdsDecoder: def __init__(self): self.rds_display = self.session.instantiateDialog(RdsInfoDisplay) self.rass_interactive = None - + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { iPlayableService.evEnd: self.__serviceStopped, iPlayableService.evUpdatedRassSlidePic: self.RassSlidePicChanged }) - + self["RdsActions"] = ActionMap(["InfobarRdsActions"], { "startRassInteractive": self.startRassInteractive @@ -610,7 +604,7 @@ class InfoBarServiceName: class InfoBarSeek: """handles actions like seeking, pause""" - + # ispause, isff, issm SEEK_STATE_PLAY = (0, 0, 0, ">") SEEK_STATE_PAUSE = (1, 0, 0, "||") @@ -620,24 +614,24 @@ class InfoBarSeek: SEEK_STATE_FF_32X = (0, 32, 0, ">> 32x") SEEK_STATE_FF_64X = (0, 64, 0, ">> 64x") SEEK_STATE_FF_128X = (0, 128, 0, ">> 128x") - + SEEK_STATE_BACK_16X = (0, -16, 0, "<< 16x") SEEK_STATE_BACK_32X = (0, -32, 0, "<< 32x") SEEK_STATE_BACK_64X = (0, -64, 0, "<< 64x") SEEK_STATE_BACK_128X = (0, -128, 0, "<< 128x") - + SEEK_STATE_SM_HALF = (0, 0, 2, "/2") SEEK_STATE_SM_QUARTER = (0, 0, 4, "/4") SEEK_STATE_SM_EIGHTH = (0, 0, 8, "/8") SEEK_STATE_EOF = (1, 0, 0, "END") - def __init__(self): + def __init__(self, actionmap = "InfobarSeekActions"): self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged, iPlayableService.evStart: self.__serviceStarted, - + iPlayableService.evEOF: self.__evEOF, iPlayableService.evSOF: self.__evSOF, }) @@ -646,59 +640,55 @@ class InfoBarSeek: def __init__(self, screen, *args, **kwargs): HelpableActionMap.__init__(self, screen, *args, **kwargs) self.screen = screen - + def action(self, contexts, action): print "action:", action if action[:5] == "seek:": time = int(action[5:]) self.screen.seekRelative(time * 90000) - self.screen.doShow() + self.screen.showAfterSeek() return 1 else: return HelpableActionMap.action(self, contexts, action) - self["SeekActions"] = InfoBarSeekActionMap(self, "InfobarSeekActions", + self["SeekActions"] = InfoBarSeekActionMap(self, actionmap, { - "playpauseService": (self.playpauseService, _("pause")), + "playpauseService": self.playpauseService, "pauseService": (self.pauseService, _("pause")), "unPauseService": (self.unPauseService, _("continue")), - + "seekFwd": (self.seekFwd, _("skip forward")), - "seekFwdDown": self.seekFwdDown, - "seekFwdUp": self.seekFwdUp, + "seekFwdManual": (self.seekFwdManual, _("skip forward (enter time)")), "seekBack": (self.seekBack, _("skip backward")), - "seekBackDown": self.seekBackDown, - "seekBackUp": self.seekBackUp, + "seekBackManual": (self.seekBackManual, _("skip backward (enter time)")), + + "seekFwdDef": (self.seekFwdDef, _("skip forward (self defined)")), + "seekBackDef": (self.seekBackDef, _("skip backward (self defined)")) }, prio=-1) # give them a little more priority to win over color buttons self["SeekActions"].setEnabled(False) self.seekstate = self.SEEK_STATE_PLAY - self.onClose.append(self.delTimer) - self.fwdtimer = False - self.fwdKeyTimer = eTimer() - self.fwdKeyTimer.timeout.get().append(self.fwdTimerFire) + self.seek_flag = True - self.rwdtimer = False - self.rwdKeyTimer = eTimer() - self.rwdKeyTimer.timeout.get().append(self.rwdTimerFire) - self.onPlayStateChanged = [ ] - + self.lockedBecauseOfSkipping = False + self.__seekableStatusChanged() + + def showAfterSeek(self): + if isinstance(self, InfoBarShowHide): + self.doShow() + def up(self): pass - + def down(self): pass - - def delTimer(self): - del self.fwdKeyTimer - del self.rwdKeyTimer - + def getSeek(self): service = self.session.nav.getCurrentService() if service is None: @@ -708,9 +698,9 @@ class InfoBarSeek: if seek is None or not seek.isCurrentlySeekable(): return None - + return seek - + def isSeekable(self): if self.getSeek() is None: return False @@ -732,10 +722,10 @@ class InfoBarSeek: def setSeekState(self, state): service = self.session.nav.getCurrentService() - + if service is None: return False - + if not self.isSeekable(): if state not in [self.SEEK_STATE_PLAY, self.SEEK_STATE_PAUSE]: state = self.SEEK_STATE_PLAY @@ -759,7 +749,7 @@ class InfoBarSeek: self.checkSkipShowHideLock() return True - + def playpauseService(self): if self.seekstate != self.SEEK_STATE_PLAY: self.unPauseService() @@ -777,41 +767,24 @@ class InfoBarSeek: print "no", self.seekstate print "pause" self.setSeekState(self.SEEK_STATE_PAUSE); - + def unPauseService(self): print "unpause" if self.seekstate == self.SEEK_STATE_PLAY: return 0 self.setSeekState(self.SEEK_STATE_PLAY) - + def doSeek(self, seektime): print "doseek", seektime service = self.session.nav.getCurrentService() if service is None: return - + seekable = self.getSeek() if seekable is None: return - - seekable.seekTo(90 * seektime) - - def seekFwdDown(self): - print "start fwd timer" - self.fwdtimer = True - self.fwdKeyTimer.start(1000) - - def seekBackDown(self): - print "start rewind timer" - self.rwdtimer = True - self.rwdKeyTimer.start(1000) - def seekFwdUp(self): - print "seekFwdUp" - if self.fwdtimer: - self.fwdKeyTimer.stop() - self.fwdtimer = False - self.seekFwd() + seekable.seekTo(90 * seektime) def seekFwd(self): lookup = { @@ -833,14 +806,7 @@ class InfoBarSeek: self.SEEK_STATE_EOF: self.SEEK_STATE_EOF, } self.setSeekState(lookup[self.seekstate]) - - def seekBackUp(self): - print "seekBackUp" - if self.rwdtimer: - self.rwdKeyTimer.stop() - self.rwdtimer = False - self.seekBack() - + def seekBack(self): lookup = { self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_16X, @@ -861,43 +827,53 @@ class InfoBarSeek: self.SEEK_STATE_EOF: self.SEEK_STATE_BACK_16X, } self.setSeekState(lookup[self.seekstate]) - + if self.seekstate == self.SEEK_STATE_PAUSE: seekable = self.getSeek() if seekable is not None: seekable.seekRelative(-1, 3) - def fwdTimerFire(self): - print "Display seek fwd" - self.fwdKeyTimer.stop() - self.fwdtimer = False - self.session.openWithCallback(self.fwdSeekTo, MinuteInput) + def seekFwdDef(self): + self.seek_flag = False + seconds = config.usage.self_defined_seek.value + print "Seek", seconds, "seconds self defined forward" + seekable = self.getSeek() + if seekable is not None: + seekable.seekRelative(1, seconds * 90000) + def seekBackDef(self): + self.seek_flag = False + seconds = config.usage.self_defined_seek.value + print "Seek", seconds, "seconds self defined backward" + seekable = self.getSeek() + if seekable is not None: + seekable.seekRelative(1, 0 - seconds * 90000) + + def seekFwdManual(self): + self.session.openWithCallback(self.fwdSeekTo, MinuteInput) + def fwdSeekTo(self, minutes): print "Seek", minutes, "minutes forward" if minutes != 0: seekable = self.getSeek() if seekable is not None: seekable.seekRelative(1, minutes * 60 * 90000) - - def rwdTimerFire(self): - print "rwdTimerFire" - self.rwdKeyTimer.stop() - self.rwdtimer = False + + def seekBackManual(self): self.session.openWithCallback(self.rwdSeekTo, MinuteInput) - + def rwdSeekTo(self, minutes): print "rwdSeekTo" self.fwdSeekTo(0 - minutes) - + def checkSkipShowHideLock(self): wantlock = self.seekstate != self.SEEK_STATE_PLAY - + if config.usage.show_infobar_on_zap.value: if self.lockedBecauseOfSkipping and not wantlock: self.unlockShow() self.lockedBecauseOfSkipping = False - + if wantlock and not self.lockedBecauseOfSkipping: self.lockShow() self.lockedBecauseOfSkipping = True @@ -915,17 +891,20 @@ class InfoBarSeek: self.seekRelativeToEnd(-90000) else: self.setSeekState(self.SEEK_STATE_EOF) - + def __evSOF(self): self.setSeekState(self.SEEK_STATE_PLAY) self.doSeek(0) def seekRelative(self, diff): - seekable = self.getSeek() - if seekable is not None: - print "seekRelative: res:", seekable.seekRelative(1, diff) + if self.seek_flag == True: + seekable = self.getSeek() + if seekable is not None: + print "seekRelative: res:", seekable.seekRelative(1, diff) + else: + print "seek failed!" else: - print "seek failed!" + self.seek_flag = True def seekRelativeToEnd(self, diff): assert diff <= 0, "diff is expected to be negative!" @@ -978,9 +957,9 @@ class InfoBarShowMovies: def __init__(self): self["MovieListActions"] = HelpableActionMap(self, "InfobarMovieListActions", { - "movieList": (self.showMovies, "movie list"), - "up": (self.showMovies, "movie list"), - "down": (self.showMovies, "movie list") + "movieList": (self.showMovies, _("movie list")), + "up": (self.showMovies, _("movie list")), + "down": (self.showMovies, _("movie list")) }) # InfoBarTimeshift requires InfoBarSeek, instantiated BEFORE! @@ -990,7 +969,7 @@ class InfoBarShowMovies: # Timeshift works the following way: # demux0 demux1 "TimeshiftActions" "TimeshiftActivateActions" "SeekActions" # - normal playback TUNER unused PLAY enable disable disable -# - user presses "yellow" button. TUNER record PAUSE enable disable enable +# - user presses "yellow" button. FILE record PAUSE enable disable enable # - user presess pause again FILE record PLAY enable disable enable # - user fast forwards FILE record FF enable disable enable # - end of timeshift buffer reached TUNER record PLAY enable enable disable @@ -1057,7 +1036,8 @@ class InfoBarTimeshift: #self.pvrStateDialog["timeshift"].setRelative(time.time()) # PAUSE. - self.setSeekState(self.SEEK_STATE_PAUSE) + #self.setSeekState(self.SEEK_STATE_PAUSE) + self.activateTimeshiftEnd(False) # enable the "TimeshiftEnableActions", which will override # the startTimeshift actions @@ -1116,13 +1096,13 @@ class InfoBarTimeshift: print "activateTimeshiftEndAndPause" #state = self.seekstate self.activateTimeshiftEnd(False) - + def __seekableStatusChanged(self): enabled = False - + 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 # the timeshift @@ -1141,10 +1121,10 @@ from Screens.PiPSetup import PiPSetup class InfoBarExtensions: EXTENSION_SINGLE = 0 EXTENSION_LIST = 1 - + def __init__(self): self.list = [] - + self["InstantExtensionsActions"] = HelpableActionMap(self, "InfobarExtensions", { "extensions": (self.showExtensionSelection, _("view extensions...")), @@ -1152,13 +1132,13 @@ class InfoBarExtensions: def addExtension(self, extension, key = None, type = EXTENSION_SINGLE): self.list.append((type, extension, key)) - + def updateExtension(self, extension, key = None): self.extensionsList.append(extension) if key is not None: if self.extensionKeys.has_key(key): key = None - + if key is None: for x in self.availableKeys: if not self.extensionKeys.has_key(x): @@ -1167,7 +1147,7 @@ class InfoBarExtensions: if key is not None: self.extensionKeys[key] = len(self.extensionsList) - 1 - + def updateExtensions(self): self.extensionsList = [] self.availableKeys = [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "red", "green", "yellow", "blue" ] @@ -1213,10 +1193,10 @@ from Components.PluginComponent import plugins class InfoBarPlugins: def __init__(self): self.addExtension(extension = self.getPluginList, type = InfoBarExtensions.EXTENSION_LIST) - + def getPluginName(self, name): return name - + def getPluginList(self): list = [] for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EXTENSIONSMENU): @@ -1224,13 +1204,15 @@ class InfoBarPlugins: return list def runPlugin(self, plugin): + self.session.servicelist = self.servicelist plugin(session = self.session) + del self.session.servicelist # depends on InfoBarExtensions class InfoBarSleepTimer: def __init__(self): - self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, self.available), "1") - + self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, self.available), "1") + def available(self): return True @@ -1248,31 +1230,32 @@ class InfoBarPiP: self.addExtension((self.getShowHideName, self.showPiP, self.available), "blue") self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green") self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow") - + def available(self): return True - + def pipShown(self): return self.session.pipshown - + def getShowHideName(self): if self.session.pipshown: return _("Disable Picture in Picture") else: return _("Activate Picture in Picture") - + def getSwapName(self): return _("Swap Services") - + def getMoveName(self): return _("Move Picture in Picture") - + def showPiP(self): if self.session.pipshown: del self.session.pip self.session.pipshown = False else: self.session.pip = self.session.instantiateDialog(PictureInPicture) + self.session.pip.show() newservice = self.session.nav.getCurrentlyPlayingServiceReference() if self.session.pip.playService(newservice): self.session.pipshown = True @@ -1281,7 +1264,7 @@ class InfoBarPiP: self.session.pipshown = False del self.session.pip self.session.nav.playService(newservice) - + def swapPiP(self): swapservice = self.session.nav.getCurrentlyPlayingServiceReference() if self.session.pip.servicePath: @@ -1294,7 +1277,7 @@ class InfoBarPiP: self.session.nav.stopService() # stop portal self.session.nav.playService(pipref) # start subservice self.session.pip.servicePath=servicepath - + def movePiP(self): self.session.open(PiPSetup, pip = self.session.pip) @@ -1313,14 +1296,14 @@ class InfoBarInstantRecord: self["BlinkingPoint"].hide() self["BlinkingPoint"].setConnect(self.session.nav.RecordTimer.isRecording) - def stopCurrentRecording(self, entry = -1): + def stopCurrentRecording(self, entry = -1): 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() - + # try to get event info event = None try: @@ -1339,7 +1322,7 @@ class InfoBarInstantRecord: name = "instant record" description = "" eventid = None - + if event is not None: curEvent = parseEvent(event) name = curEvent[2] @@ -1350,15 +1333,15 @@ class InfoBarInstantRecord: else: if limitEvent: self.session.open(MessageBox, _("No event info found, recording indefinitely."), MessageBox.TYPE_INFO) - + data = (begin, end, name, description, eventid) - + recording = self.session.nav.recordWithTimer(serviceref, *data) recording.dontSave = True self.recording.append(recording) - + #self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning()) - + def isInstantRecordRunning(self): print "self.recording:", self.recording if len(self.recording) > 0: @@ -1369,7 +1352,7 @@ class InfoBarInstantRecord: def recordQuestionCallback(self, answer): print "pre:\n", self.recording - + if answer is None or answer[1] == "no": return list = [] @@ -1378,29 +1361,46 @@ class InfoBarInstantRecord: if not x in self.session.nav.RecordTimer.timer_list: self.recording.remove(x) elif x.dontSave and x.isRunning(): - list.append(TimerEntryComponent(x, False)) + list.append(TimerEntryComponent(x, False)) if answer[1] == "changeduration": if len(self.recording) == 1: self.changeDuration(0) else: self.session.openWithCallback(self.changeDuration, TimerSelection, list) + elif answer[1] == "changeendtime": + if len(self.recording) == 1: + self.setEndtime(0) + else: + self.session.openWithCallback(self.setEndTime, TimerSelection, list) elif answer[1] == "stop": if len(self.recording) == 1: self.stopCurrentRecording(0) else: self.session.openWithCallback(self.stopCurrentRecording, TimerSelection, list) - if answer[1] == "indefinitely" or answer[1] == "manualduration" or answer[1] == "event": - limitEvent = False - if answer[1] == "event": - limitEvent = True + elif answer[1] in ( "indefinitely" , "manualduration", "manualendtime", "event"): + self.startInstantRecording(limitEvent = answer[1] in ("event", "manualendtime") or False) if answer[1] == "manualduration": - self.selectedEntry = len(self.recording) - self.session.openWithCallback(self.inputCallback, InputBox, title=_("How many minutes do you want to record?"), text="5", maxSize=False, type=Input.NUMBER) - self.startInstantRecording(limitEvent = limitEvent) - + self.changeDuration(len(self.recording)-1) + elif answer[1] == "manualendtime": + self.setEndtime(len(self.recording)-1) print "after:\n", self.recording + def setEndtime(self, entry): + if entry is not None: + self.selectedEntry = entry + self.endtime=ConfigClock(default = self.recording[self.selectedEntry].end) + dlg = self.session.openWithCallback(self.TimeDateInputClosed, TimeDateInput, self.endtime) + dlg.setTitle(_("Please change recording endtime")) + + def TimeDateInputClosed(self, ret): + if len(ret) > 1: + if ret[0]: + localendtime = localtime(ret[1]) + print "stopping recording at", strftime("%c", localendtime) + self.recording[self.selectedEntry].end = ret[1] + self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry]) + def changeDuration(self, entry): if entry is not None: self.selectedEntry = entry @@ -1424,9 +1424,11 @@ class InfoBarInstantRecord: title=_("A recording is currently running.\nWhat do you want to do?"), \ list=[(_("stop recording"), "stop"), \ (_("change recording (duration)"), "changeduration"), \ + (_("change recording (endtime)"), "changeendtime"), \ (_("add recording (indefinitely)"), "indefinitely"), \ (_("add recording (stop after current event)"), "event"), \ (_("add recording (enter recording duration)"), "manualduration"), \ + (_("add recording (enter recording endtime)"), "manualendtime"), \ (_("do nothing"), "no")]) else: self.session.openWithCallback(self.recordQuestionCallback, ChoiceBox, \ @@ -1434,6 +1436,7 @@ class InfoBarInstantRecord: list=[(_("add recording (indefinitely)"), "indefinitely"), \ (_("add recording (stop after current event)"), "event"), \ (_("add recording (enter recording duration)"), "manualduration"), \ + (_("add recording (enter recording endtime)"), "manualendtime"), \ (_("don't record"), "no")]) from Tools.ISO639 import LanguageCodes @@ -1460,17 +1463,17 @@ class InfoBarAudioSelection: i = audio.getTrackInfo(x) language = i.getLanguage() description = i.getDescription() - + if LanguageCodes.has_key(language): language = LanguageCodes[language][0] - + if len(description): description += " (" + language + ")" else: description = language - + tlist.append((description, x)) - + selectedAudio = tlist[0][1] tlist.sort(lambda x,y : cmp(x[0], y[0])) @@ -1675,10 +1678,10 @@ class InfoBarNotifications: self.onExecBegin.append(self.checkNotifications) Notifications.notificationAdded.append(self.checkNotificationsIfExecing) self.onClose.append(self.__removeNotification) - + def __removeNotification(self): Notifications.notificationAdded.remove(self.checkNotificationsIfExecing) - + def checkNotificationsIfExecing(self): if self.execing: self.checkNotifications() @@ -1686,7 +1689,7 @@ class InfoBarNotifications: def checkNotifications(self): if len(Notifications.notifications): n = Notifications.notifications[0] - + Notifications.notifications = Notifications.notifications[1:] cb = n[0] @@ -1698,7 +1701,7 @@ class InfoBarNotifications: dlg = self.session.openWithCallback(cb, n[1], *n[2], **n[3]) else: dlg = self.session.open(n[1], *n[2], **n[3]) - + # remember that this notification is currently active d = (n[4], dlg) Notifications.current_notifications.append(d) @@ -1727,17 +1730,17 @@ class InfoBarCueSheetSupport: CUT_TYPE_OUT = 1 CUT_TYPE_MARK = 2 CUT_TYPE_LAST = 3 - + ENABLE_RESUME_SUPPORT = False - - def __init__(self): - self["CueSheetActions"] = HelpableActionMap(self, "InfobarCueSheetActions", + + def __init__(self, actionmap = "InfobarCueSheetActions"): + self["CueSheetActions"] = HelpableActionMap(self, actionmap, { - "jumpPreviousMark": (self.jumpPreviousMark, "jump to next marked position"), - "jumpNextMark": (self.jumpNextMark, "jump to previous marked position"), - "toggleMark": (self.toggleMark, "toggle a cut mark at the current position") + "jumpPreviousMark": (self.jumpPreviousMark, _("jump to previous marked position")), + "jumpNextMark": (self.jumpNextMark, _("jump to next marked position")), + "toggleMark": (self.toggleMark, _("toggle a cut mark at the current position")) }, prio=1) - + self.cut_list = [ ] self.is_closing = False self.__event_tracker = ServiceEventTracker(screen=self, eventmap= @@ -1750,14 +1753,14 @@ class InfoBarCueSheetSupport: return print "new service started! trying to download cuts!" self.downloadCuesheet() - + if self.ENABLE_RESUME_SUPPORT: last = None - + for (pts, what) in self.cut_list: if what == self.CUT_TYPE_LAST: last = pts - + if last is not None: self.resume_point = last Notifications.AddNotificationWithCallback(self.playLastCB, MessageBox, _("Do you want to resume this playback?"), timeout=10) @@ -1767,6 +1770,11 @@ class InfoBarCueSheetSupport: seekable = self.__getSeekable() if seekable is not None: seekable.seekTo(self.resume_point) + self.hideAfterResume() + + def hideAfterResume(self): + if isinstance(self, InfoBarShowHide): + self.hide() def __getSeekable(self): service = self.session.nav.getCurrentService() @@ -1812,7 +1820,7 @@ class InfoBarCueSheetSupport: nearest = None for cp in self.cut_list: diff = cmp(cp[0] - pts) - if diff >= 0 and (nearest is None or cmp(nearest[0] - pts) > diff): + if cp[1] == self.CUT_TYPE_MARK and diff >= 0 and (nearest is None or cmp(nearest[0] - pts) > diff): nearest = cp return nearest @@ -1821,9 +1829,9 @@ class InfoBarCueSheetSupport: if current_pos is None: print "not seekable" return - + nearest_cutpoint = self.getNearestCutPoint(current_pos) - + if nearest_cutpoint is not None and abs(nearest_cutpoint[0] - current_pos) < tolerance: if onlyreturn: return nearest_cutpoint @@ -1831,17 +1839,23 @@ class InfoBarCueSheetSupport: self.removeMark(nearest_cutpoint) elif not onlyremove and not onlyreturn: self.addMark((current_pos, self.CUT_TYPE_MARK)) - + if onlyreturn: return None def addMark(self, point): insort(self.cut_list, point) self.uploadCuesheet() + self.showAfterCuesheetOperation() def removeMark(self, point): self.cut_list.remove(point) self.uploadCuesheet() + self.showAfterCuesheetOperation() + + def showAfterCuesheetOperation(self): + if isinstance(self, InfoBarShowHide): + self.doShow() def __getCuesheet(self): service = self.session.nav.getCurrentService() @@ -1861,9 +1875,10 @@ class InfoBarCueSheetSupport: cue = self.__getCuesheet() if cue is None: - print "upload failed, no cuesheet interface" - return - self.cut_list = cue.getCutList() + print "download failed, no cuesheet interface" + self.cut_list = [ ] + else: + self.cut_list = cue.getCutList() class InfoBarSummary(Screen): skin = """ @@ -1884,17 +1899,17 @@ class InfoBarSummary(Screen): class InfoBarSummarySupport: def __init__(self): pass - + def createSummary(self): return InfoBarSummary class InfoBarTeletextPlugin: def __init__(self): self.teletext_plugin = None - + for p in plugins.getPlugins(PluginDescriptor.WHERE_TELETEXT): self.teletext_plugin = p - + if self.teletext_plugin is not None: self["TeletextActions"] = HelpableActionMap(self, "InfobarTeletextActions", { @@ -1918,6 +1933,7 @@ class InfoBarSubtitleSupport(object): iPlayableService.evUpdatedInfo: self.__updatedInfo }) self.cached_subtitle_checked = False + self.__selected_subtitle = None def __serviceStopped(self): self.subtitle_window.hide() @@ -1928,8 +1944,7 @@ class InfoBarSubtitleSupport(object): if not self.cached_subtitle_checked: subtitle = self.getCurrentServiceSubtitle() self.cached_subtitle_checked = True - if subtitle: - self.__selected_subtitle = subtitle.getCachedSubtitle() + self.__selected_subtitle = subtitle and subtitle.getCachedSubtitle() if self.__selected_subtitle: subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle) self.subtitle_window.show() @@ -1938,7 +1953,7 @@ class InfoBarSubtitleSupport(object): def getCurrentServiceSubtitle(self): service = self.session.nav.getCurrentService() return service and service.subtitle() - + def setSubtitlesEnable(self, enable=True): subtitle = self.getCurrentServiceSubtitle() if enable and self.__selected_subtitle is not None: @@ -1975,7 +1990,7 @@ class InfoBarServiceErrorPopupSupport: service = self.session.nav.getCurrentService() info = service and service.info() error = info and info.getInfo(iServiceInformation.sDVBState) - + if error == self.last_error: error = None else: