X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0b3f0682adc10d05a81c26e5a99cc77b9f0f507d..f7e17fd8e9c3afcb4ca28b9770b8e97275e4bd92:/lib/python/Screens/InfoBarGenerics.py diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 13c3ad31..b27ed48c 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -9,7 +9,6 @@ from Components.Label import Label from Components.Pixmap import Pixmap from Components.PluginComponent import plugins from Components.ServiceEventTracker import ServiceEventTracker -from Components.Sources.Source import ObsoleteSource from Components.Sources.Boolean import Boolean from Components.config import config, ConfigBoolean, ConfigClock from Components.SystemInfo import SystemInfo @@ -539,17 +538,6 @@ class InfoBarEPG: self.epglist[1]=tmp setEvent(self.epglist[0]) -class InfoBarTuner: - """provides a snr/agc/ber display""" - def __init__(self): - self["FrontendStatus"] = ObsoleteSource(new_source = "session.FrontendStatus", removal_date = "2008-01") - -class InfoBarEvent: - """provides a current/next event info display""" - def __init__(self): - self["Event_Now"] = ObsoleteSource(new_source = "session.Event_Now", removal_date = "2008-01") - self["Event_Next"] = ObsoleteSource(new_source = "session.Event_Next", removal_date = "2008-01") - class InfoBarRdsDecoder: """provides RDS and Rass support/display""" def __init__(self): @@ -598,10 +586,6 @@ class InfoBarRdsDecoder: self.RassSlidePicChanged() self.rds_display.show() -class InfoBarServiceName: - def __init__(self): - self["CurrentService"] = ObsoleteSource(new_source = "session.CurrentService", removal_date = "2008-01") - class InfoBarSeek: """handles actions like seeking, pause""" @@ -609,7 +593,7 @@ class InfoBarSeek: SEEK_STATE_PAUSE = (1, 0, 0, "||") SEEK_STATE_EOF = (1, 0, 0, "END") - def __init__(self, actionmap = "InfobarSeekActions"): + def __init__(self, actionmap = "InfobarSeekActions", useSeekBackHack=True): self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged, @@ -624,7 +608,7 @@ class InfoBarSeek: self.eofInhibitTimer = eTimer() self.eofInhibitTimer.timeout.get().append(self.inhibitEof) -# self.minSpeedBackward = 16 + self.minSpeedBackward = useSeekBackHack and 16 or 0 class InfoBarSeekActionMap(HelpableActionMap): def __init__(self, screen, *args, **kwargs): @@ -682,13 +666,12 @@ class InfoBarSeek: def makeStateBackward(self, n): minspeed = config.seek.stepwise_minspeed.value repeat = int(config.seek.stepwise_repeat.value) -# if n < self.minSpeedBackward: -# r = (self.minSpeedBackward - 1)/ n + 1 -# if minspeed != "Never" and n >= int(minspeed) and repeat > 1: -# r = max(r, repeat) -# return (0, -n * r, r, "<< %dx" % n) -# el - if minspeed != "Never" and n >= int(minspeed) and repeat > 1: + if self.minSpeedBackward and n < self.minSpeedBackward: + r = (self.minSpeedBackward - 1)/ n + 1 + if minspeed != "Never" and n >= int(minspeed) and repeat > 1: + r = max(r, repeat) + return (0, -n * r, r, "<< %dx" % n) + elif minspeed != "Never" and n >= int(minspeed) and repeat > 1: return (0, -n * repeat, repeat, "<< %dx" % n) else: return (0, -n, 0, "<< %dx" % n) @@ -1296,10 +1279,7 @@ class InfoBarPlugins: # depends on InfoBarExtensions class InfoBarSleepTimer: def __init__(self): - self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, self.available), "1") - - def available(self): - return True + self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, lambda: True), "1") def getSleepTimerName(self): return _("Sleep Timer") @@ -1312,13 +1292,10 @@ class InfoBarPiP: def __init__(self): self.session.pipshown = False if SystemInfo.get("NumVideoDecoders", 1) > 1: - self.addExtension((self.getShowHideName, self.showPiP, self.available), "blue") + self.addExtension((self.getShowHideName, self.showPiP, lambda: True), "blue") self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green") self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow") - def available(self): - return SystemInfo.get("NumVideoDecoders", 1) > 1 - def pipShown(self): return self.session.pipshown @@ -1390,13 +1367,6 @@ class InfoBarInstantRecord: "instantRecord": (self.instantRecord, _("Instant Record...")), }) self.recording = [] -#### DEPRECATED CODE #### - self["BlinkingPoint"] = BlinkingPixmapConditional() - self["BlinkingPoint"].setConnect(self.session.nav.RecordTimer.isRecording) - self["BlinkingPoint"].deprecationInfo = ( - "session.RecordState source, Pixmap renderer and " - "ConditionalShowHide/Blink Converter", "2008-02") -######################### def stopCurrentRecording(self, entry = -1): if entry is not None and entry != -1: @@ -1442,10 +1412,6 @@ class InfoBarInstantRecord: recording.dontSave = True self.recording.append(recording) -#### DEPRECATED CODE #### - self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning()) -######################### - def isInstantRecordRunning(self): print "self.recording:", self.recording if len(self.recording) > 0: @@ -1664,7 +1630,7 @@ class InfoBarSubserviceSelection: if newservice.valid(): del subservices del service - self.session.nav.playService(newservice) + self.session.nav.playService(newservice, False) def subserviceSelection(self): service = self.session.nav.getCurrentService() @@ -1704,7 +1670,7 @@ class InfoBarSubserviceSelection: self.session.open(SubservicesQuickzap, service[2]) else: self["SubserviceQuickzapAction"].setEnabled(True) - self.session.nav.playService(service[1]) + self.session.nav.playService(service[1], False) def addSubserviceToBouquetCallback(self, service): if len(service) > 1 and isinstance(service[1], eServiceReference): @@ -1739,59 +1705,6 @@ class InfoBarAdditionalInfo: self["TimeshiftPossible"] = self["RecordingPossible"] self["ExtensionsAvailable"] = Boolean(fixed=1) -######### DEPRECATED CODE ########## - self["NimA"] = Pixmap() - self["NimA"].deprecationInfo = ( - "session.TunerInfo source, Pixmap renderer, TunerInfo/UseMask Converter" - ", ValueBitTest(1) Converter and ConditionalShowHide Converter", "2008-02") - self["NimB"] = Pixmap() - self["NimB"].deprecationInfo = ( - "session.TunerInfo source, Pixmap renderer, TunerInfo/UseMask Converter" - ", ValueBitTest(2) Converter and ConditionalShowHide Converter", "2008-02") - self["NimA_Active"] = Pixmap() - self["NimA_Active"].deprecationInfo = ( - "session.FrontendInfo source, Pixmap renderer, FrontendInfo/NUMBER Converter" - ", ValueRange(1,1) Converter and ConditionalShowHide Converter", "2008-02") - self["NimB_Active"] = Pixmap() - self["NimB_Active"].deprecationInfo = ( - "session.FrontendInfo source, Pixmap renderer, FrontendInfo/NUMBER Converter" - ", ValueRange(1,1) Converter and ConditionalShowHide Converter", "2008-02") - - res_mgr = eDVBResourceManager.getInstance() - if res_mgr: - res_mgr.frontendUseMaskChanged.get().append(self.tunerUseMaskChanged) - - self.session.nav.event.append(self.gotServiceEvent) # we like to get service events - - 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 checkTunerState(self, service): - info = service and 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.evUpdatedInfo or ev == iPlayableService.evEnd: - self.checkTunerState(service) -#################################### - class InfoBarNotifications: def __init__(self): self.onExecBegin.append(self.checkNotifications)