git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix
[enigma2.git]
/
timer.py
diff --git
a/timer.py
b/timer.py
index 09f64e3f8abbe9e9ca890599f20bcd0b5f017070..a912f1c629c0ae4b8f394ad2b61359955810da99 100644
(file)
--- a/
timer.py
+++ b/
timer.py
@@
-81,11
+81,19
@@
class TimerEntry:
# set begin to now.
if self.begin > self.end:
self.begin = self.end
# set begin to now.
if self.begin > self.end:
self.begin = self.end
+
+ self.cancelled = True
# must be overridden!
def getNextActivation():
pass
# must be overridden!
def getNextActivation():
pass
+ def disable(self):
+ self.disabled = True
+
+ def enable(self):
+ self.disabled = False
+
class Timer:
# the time between "polls". We do this because
# we want to account for time jumps etc.
class Timer:
# the time between "polls". We do this because
# we want to account for time jumps etc.
@@
-113,6
+121,11
@@
class Timer:
for f in self.on_state_change:
f(entry)
for f in self.on_state_change:
f(entry)
+ def getNextRecordingTime(self):
+ if len(self.timer_list) > 0:
+ return self.timer_list[0].begin
+ return -1
+
def cleanup(self):
self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
def cleanup(self):
self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
@@
-124,6
+137,9
@@
class Timer:
# right into the processedTimers.
if entry.shouldSkip() or entry.state == TimerEntry.StateEnded or (entry.state == TimerEntry.StateWaiting and entry.disabled):
print "already passed, skipping"
# right into the processedTimers.
if entry.shouldSkip() or entry.state == TimerEntry.StateEnded or (entry.state == TimerEntry.StateWaiting and entry.disabled):
print "already passed, skipping"
+ print "shouldSkip:", entry.shouldSkip()
+ print "state == ended", entry.state == TimerEntry.StateEnded
+ print "waiting && disabled:", (entry.state == TimerEntry.StateWaiting and entry.disabled)
bisect.insort(self.processed_timers, entry)
entry.state = TimerEntry.StateEnded
else:
bisect.insort(self.processed_timers, entry)
entry.state = TimerEntry.StateEnded
else:
@@
-162,12
+178,16
@@
class Timer:
self.setNextActivation(min)
def timeChanged(self, timer):
self.setNextActivation(min)
def timeChanged(self, timer):
+ print "time changed"
timer.timeChanged()
if timer.state == TimerEntry.StateEnded:
self.processed_timers.remove(timer)
else:
self.timer_list.remove(timer)
timer.timeChanged()
if timer.state == TimerEntry.StateEnded:
self.processed_timers.remove(timer)
else:
self.timer_list.remove(timer)
+ # give the timer a chance to re-enqueue
+ if timer.state == TimerEntry.StateEnded:
+ timer.state = TimerEntry.StateWaiting
self.addTimerEntry(timer)
def doActivate(self, w):
self.addTimerEntry(timer)
def doActivate(self, w):