cleanup some imports

[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 0925684c9f754ff454211cbe60daf5f532ceac71..a4bc874f534e3812b839fa71d67002fbafc64130 100644 (file)
--- a/lib/python/Components/Sources/EventInfo.py
+++ b/lib/python/Components/Sources/EventInfo.py
@@ -1,8 +1,9 @@
 from Components.PerServiceDisplay import PerServiceBase
-from Tools.Event import Event
+from Components.Element import cached
 from enigma import iPlayableService
 from Source import Source
 
+
 class EventInfo(PerServiceBase, Source, object):
        NOW = 0
        NEXT = 1
@@ -11,15 +12,23 @@ class EventInfo(PerServiceBase, Source, object):
                Source.__init__(self)
                PerServiceBase.__init__(self, navcore, 
                        { 
-                               iPlayableService.evUpdatedEventInfo: self.changed,
-                               iPlayableService.evEnd: self.changed
-                       })
+                               iPlayableService.evStart: self.gotEvent,
+                               iPlayableService.evUpdatedEventInfo: self.gotEvent,
+                               iPlayableService.evEnd: self.gotEvent
+                       }, with_event=True)
                
                self.now_or_next = now_or_next
-               
+
+       @cached
        def getEvent(self):
                service = self.navcore.getCurrentService()
                info = service and service.info()
                return info and info.getEvent(self.now_or_next)
 
        event = property(getEvent)
+
+       def gotEvent(self, what):
+               if what in [iPlayableService.evStart, iPlayableService.evEnd]:
+                       self.changed((self.CHANGED_CLEAR,))
+               else:
+                       self.changed((self.CHANGED_ALL,))