remove "wait..."

[enigma2.git] / lib / python / Components / EventInfo.py

diff --git a/lib/python/Components/EventInfo.py b/lib/python/Components/EventInfo.py
index 125310be4f30ecb17b08b83a9984cc7c1c9a3692..76fe7e4eb652ffb6d46f0458a4617365cab79285 100644 (file)
--- a/lib/python/Components/EventInfo.py
+++ b/lib/python/Components/EventInfo.py
@@ -1,10 +1,16 @@
 from PerServiceDisplay import *
 from PerServiceDisplay import *

+from time import strftime
+from time import localtime
+
+from enigma import iServiceInformationPtr, eServiceEventPtr

 
 class EventInfo(PerServiceDisplay):
        Now = 0
        Next = 1
        Now_Duration = 2
        Next_Duration = 3
 
 class EventInfo(PerServiceDisplay):
        Now = 0
        Next = 1
        Now_Duration = 2
        Next_Duration = 3

+       Now_StartTime = 4
+       Next_StartTime = 5

        
        def __init__(self, navcore, now_or_next):
                # listen to evUpdatedEventInfo and evStopService
        
        def __init__(self, navcore, now_or_next):
                # listen to evUpdatedEventInfo and evStopService


@@ -21,16 +27,19 @@ class EventInfo(PerServiceDisplay):
                service = self.navcore.getCurrentService()
                
                if service != None:
                service = self.navcore.getCurrentService()
                
                if service != None:

-                       if not service.info(info):
-                               ev = eServiceEventPtr()
-                               if info.getEvent(ev, self.now_or_next & 1) == 0:
-                                       if self.now_or_next & 2:
-                                               self.setText("%d min" % (ev.m_duration / 60))
-                                       else:
-                                               self.setText(ev.m_event_name)
-               print "new event info in EventInfo! yeah!"
+                       info = service.info()
+                       if info is not None: 
+                               ev = info.getEvent(self.now_or_next & 1)
+                               if ev is not None:
+                                       if (self.Now_Duration <= self.now_or_next <= self.Next_Duration):
+                                               self.setText("%d min" % (ev.getDuration() / 60))
+                                       if (self.Now_StartTime <= self.now_or_next <= self.Next_StartTime):
+                                               self.setText(strftime("%H:%M", localtime(ev.getBeginTime())))
+                                       if (self.Now <= self.now_or_next <= self.Next):
+                                               self.setText(ev.getEventName())

 
        def stopEvent(self):
                self.setText(
 
        def stopEvent(self):
                self.setText(

-                       ("waiting for event data...", "", "--:--",  "--:--")[self.now_or_next]);
+                       #(_("waiting for event data..."), "", "--:--",  "--:--", "--:--", "--:--")[self.now_or_next]);
+                       (_(""), "", "--:--",  "--:--", "--:--", "--:--")[self.now_or_next]);