git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add remove to ipkg component and screen
[enigma2.git]
/
lib
/
python
/
Components
/
Sources
/
EventInfo.py
diff --git
a/lib/python/Components/Sources/EventInfo.py
b/lib/python/Components/Sources/EventInfo.py
index 72d5f18d19eb4bd797426a35c0b503cab6a61f5f..5af0bf9740372e7653962e31c30d48afc1cb73dc 100644
(file)
--- a/
lib/python/Components/Sources/EventInfo.py
+++ b/
lib/python/Components/Sources/EventInfo.py
@@
-1,11
+1,8
@@
from Components.PerServiceDisplay import PerServiceBase
from Components.Element import cached
from Components.PerServiceDisplay import PerServiceBase
from Components.Element import cached
-from Tools.Event import Event
-from enigma import iPlayableService
+from enigma import iPlayableService, iServiceInformation, eServiceReference, eEPGCache
from Source import Source
from Source import Source
-from time import time
-
class EventInfo(PerServiceBase, Source, object):
NOW = 0
NEXT = 1
class EventInfo(PerServiceBase, Source, object):
NOW = 0
NEXT = 1
@@
-18,19
+15,28
@@
class EventInfo(PerServiceBase, Source, object):
iPlayableService.evUpdatedEventInfo: self.gotEvent,
iPlayableService.evEnd: self.gotEvent
}, with_event=True)
iPlayableService.evUpdatedEventInfo: self.gotEvent,
iPlayableService.evEnd: self.gotEvent
}, with_event=True)
-
self.now_or_next = now_or_next
self.now_or_next = now_or_next
+ self.epgQuery = eEPGCache.getInstance().lookupEventTime
@cached
def getEvent(self):
service = self.navcore.getCurrentService()
info = service and service.info()
@cached
def getEvent(self):
service = self.navcore.getCurrentService()
info = service and service.info()
- return info and info.getEvent(self.now_or_next)
+ ret = info and info.getEvent(self.now_or_next)
+ if not ret and info:
+ refstr = info.getInfoString(iServiceInformation.sServiceref)
+ ret = self.epgQuery(eServiceReference(refstr), -1, self.now_or_next and 1 or 0)
+ return ret
event = property(getEvent)
def gotEvent(self, what):
event = property(getEvent)
def gotEvent(self, what):
- if what
in [iPlayableService.evStart, iPlayableService.evEnd]
:
+ if what
== iPlayableService.evEnd
:
self.changed((self.CHANGED_CLEAR,))
else:
self.changed((self.CHANGED_ALL,))
self.changed((self.CHANGED_CLEAR,))
else:
self.changed((self.CHANGED_ALL,))
+
+ def destroy(self):
+ PerServiceBase.destroy(self)
+ Source.destroy(self)
+