X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4f17f88e3c8f08b73081d264e5ea734de3c66ace..5a809fb2179992658911f8b2f074e60dac53454c:/lib/python/Components/EventInfo.py

diff --git a/lib/python/Components/EventInfo.py b/lib/python/Components/EventInfo.py
index 656fd279..76fe7e4e 100644
--- a/lib/python/Components/EventInfo.py
+++ b/lib/python/Components/EventInfo.py
@@ -1,4 +1,6 @@
 from PerServiceDisplay import *
+from time import strftime
+from time import localtime
 
 from enigma import iServiceInformationPtr, eServiceEventPtr
 
@@ -7,6 +9,8 @@ class EventInfo(PerServiceDisplay):
 	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
@@ -23,16 +27,19 @@ class EventInfo(PerServiceDisplay):
 		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(
-			("waiting for event data...", "", "--:--",  "--:--")[self.now_or_next]);
+			#(_("waiting for event data..."), "", "--:--",  "--:--", "--:--", "--:--")[self.now_or_next]);
+			(_(""), "", "--:--",  "--:--", "--:--", "--:--")[self.now_or_next]);