X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FSources%2FClock.py;h=60fa7ac2807bfefb4a1ed5f9013d29c159c9eb5d;hp=f840ea243113408360642a5af4770bbc69c4f77d;hb=6f73e6abddf4170357c490966d0e1c622eb376f5;hpb=2e874fa14264bf37f17ae9b9375e26059e7f35ec

diff --git a/lib/python/Components/Sources/Clock.py b/lib/python/Components/Sources/Clock.py
index f840ea2..60fa7ac 100644
--- a/lib/python/Components/Sources/Clock.py
+++ b/lib/python/Components/Sources/Clock.py
@@ -1,22 +1,31 @@
-from Tools.Event import Event
+from Components.Element import cached
 from enigma import eTimer
-import time
+from time import time as getTime
 
 from Source import Source
 
 class Clock(Source):
 	def __init__(self):
-		self.changed = Event(start=self.start, stop=self.stop)
+		Source.__init__(self)
 		self.clock_timer = eTimer()
-		self.clock_timer.timeout.get().append(self.changed)
-
-	def start(self):
+		self.clock_timer.callback.append(self.poll)
 		self.clock_timer.start(1000)
 
-	def stop(self):
-		self.clock_timer.stop()
-
+	@cached
 	def getClock(self):
-		return time.time()
+		return getTime()
 
 	time = property(getClock)
+
+	def poll(self):
+		self.changed((self.CHANGED_POLL,))
+
+	def doSuspend(self, suspended):
+		if suspended:
+			self.clock_timer.stop()
+		else:
+			self.clock_timer.start(1000)
+			self.poll()
+
+	def destroy(self):
+		self.clock_timer.timeout.get().remove(self.poll)