git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support for a final post-destroy value
[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 4833dddec9212a17d108df7a6948784aa1b2103a..ba672825cd06d40c7bd3f9eacf4e54f17fa00ea8 100644
(file)
--- a/
lib/python/Components/Sources/Clock.py
+++ b/
lib/python/Components/Sources/Clock.py
@@
-1,7
+1,6
@@
-from Tools.Event import Event
from Components.Element import cached
from enigma import eTimer
from Components.Element import cached
from enigma import eTimer
-
import t
ime
+
from time import time as getT
ime
from Source import Source
from Source import Source
@@
-9,12
+8,12
@@
class Clock(Source):
def __init__(self):
Source.__init__(self)
self.clock_timer = eTimer()
def __init__(self):
Source.__init__(self)
self.clock_timer = eTimer()
- self.clock_timer.
timeout.get()
.append(self.poll)
+ self.clock_timer.
callback
.append(self.poll)
self.clock_timer.start(1000)
@cached
def getClock(self):
self.clock_timer.start(1000)
@cached
def getClock(self):
- return
time.t
ime()
+ return
getT
ime()
time = property(getClock)
time = property(getClock)
@@
-27,3
+26,7
@@
class Clock(Source):
else:
self.clock_timer.start(1000)
self.poll()
else:
self.clock_timer.start(1000)
self.poll()
+
+ def destroy(self):
+ self.clock_timer.callback.remove(self.poll)
+ Source.destroy(self)