some cleanups,

[enigma2.git] / lib / python / Components / Sources / Clock.py

diff --git a/lib/python/Components/Sources/Clock.py b/lib/python/Components/Sources/Clock.py
index 608a719027f83157cb38f940e28b7e3dfa533c89..ba672825cd06d40c7bd3f9eacf4e54f17fa00ea8 100644 (file)
--- a/lib/python/Components/Sources/Clock.py
+++ b/lib/python/Components/Sources/Clock.py
@@ -1,6 +1,6 @@
-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
 
@@ -8,10 +8,25 @@ class Clock(Source):
        def __init__(self):
                Source.__init__(self)
                self.clock_timer = eTimer()
-               self.clock_timer.timeout.get().append(self.changed)
+               self.clock_timer.callback.append(self.poll)
                self.clock_timer.start(1000)
 
+       @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.callback.remove(self.poll)
+               Source.destroy(self)