some cleanups,

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

diff --git a/lib/python/Components/Sources/Boolean.py b/lib/python/Components/Sources/Boolean.py
index c25b4626aafb1eb362a2b7b9c18a7dddf815f573..212d2198600397fd35bf198cff2faa306fd6470f 100644 (file)
--- a/lib/python/Components/Sources/Boolean.py
+++ b/lib/python/Components/Sources/Boolean.py
@@ -1,4 +1,5 @@
 from Source import Source
+from Components.Element import cached
 from enigma import eTimer
 
 # a small warning:
@@ -11,15 +12,33 @@ from enigma import eTimer
 class Boolean(Source, object):
        def __init__(self, fixed = False, function = None, poll = 0):
                Source.__init__(self)
+               self.function = function
+               self.fixed = fixed
                if poll > 0:
                        self.poll_timer = eTimer()
-                       self.poll_timer.timeout.get().append(self.changed)
+                       self.poll_timer.callback.append(self.poll)
                        self.poll_timer.start(poll)
+               else:
+                       self.poll_timer = None
 
+       @cached
        def getBoolean(self):
                if self.function is not None:
                        return self.function()
                else:
                        return self.fixed
 
-       boolean = property(getBoolean)
+       def setBoolean(self, value):
+               assert self.function is None
+               self.fixed = value
+               self.poll()
+
+       boolean = property(getBoolean, setBoolean)
+
+       def poll(self):
+               self.changed((self.CHANGED_ALL,))
+
+       def destroy(self):
+               if self.poll_timer:
+                       self.poll_timer.callback.remove(self.poll)
+               Source.destroy(self)