git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unneeded N/A
[enigma2.git]
/
lib
/
python
/
Components
/
PerServiceDisplay.py
diff --git
a/lib/python/Components/PerServiceDisplay.py
b/lib/python/Components/PerServiceDisplay.py
index 500538c3d56708dd5cc97a512f61b57703779ace..27f151715e182c81bb9ff628ee466785fc9f865c 100644
(file)
--- a/
lib/python/Components/PerServiceDisplay.py
+++ b/
lib/python/Components/PerServiceDisplay.py
@@
-6,24
+6,28
@@
from enigma import iPlayableService
from enigma import eLabel, eSlider, eTimer
class PerServiceBase(object):
from enigma import eLabel, eSlider, eTimer
class PerServiceBase(object):
- def __init__(self, navcore, eventmap):
+ def __init__(self, navcore, eventmap
, with_event=False
):
self.eventmap = eventmap
self.navcore = navcore
self.eventmap = eventmap
self.navcore = navcore
- self.navcore.event.append(self.event)
+ self.navcore.event.append(self.event
_callback
)
self.poll_timer = eTimer()
self.poll_timer.timeout.get().append(self.poll)
self.poll_timer = eTimer()
self.poll_timer.timeout.get().append(self.poll)
+ self.with_event = with_event
# start with stopped state, so simulate that
# start with stopped state, so simulate that
- self.event(iPlayableService.evEnd)
+ self.event
_callback
(iPlayableService.evEnd)
def destroy(self):
def destroy(self):
- self.navcore.event.remove(self.event)
+ self.navcore.event.remove(self.event
_callback
)
- def event(self, ev):
+ def event
_callback
(self, ev):
# loop up if we need to handle this event
if self.eventmap.has_key(ev):
# call handler
# loop up if we need to handle this event
if self.eventmap.has_key(ev):
# call handler
- self.eventmap[ev]()
+ if self.with_event:
+ self.eventmap[ev](ev)
+ else:
+ self.eventmap[ev]()
def enablePolling(self, interval=60000):
if interval:
def enablePolling(self, interval=60000):
if interval:
@@
-50,6
+54,7
@@
class PerServiceDisplayProgress(PerServiceBase, VariableValue, GUIComponent):
def __init__(self, navcore, eventmap):
GUIComponent.__init__(self)
VariableValue.__init__(self)
def __init__(self, navcore, eventmap):
GUIComponent.__init__(self)
VariableValue.__init__(self)
+ PerServiceBase.__init__(self, navcore, eventmap)
self.eventmap = eventmap
self.navcore = navcore
self.navcore.event.append(self.event)
self.eventmap = eventmap
self.navcore = navcore
self.navcore.event.append(self.event)