projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix timer disable/reenable
[vuplus_dvbapp]
/
RecordTimer.py
diff --git
a/RecordTimer.py
b/RecordTimer.py
index
386e03f
..
9a874a4
100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-61,6
+61,7
@@
class RecordTimerEntry(timer.TimerEntry):
def resetState(self):
self.state = self.StateWaiting
def resetState(self):
self.state = self.StateWaiting
+ self.cancelled = False
self.first_try_prepare = True
self.timeChanged()
self.first_try_prepare = True
self.timeChanged()
@@
-148,6
+149,10
@@
class RecordTimerEntry(timer.TimerEntry):
self.start_prepare = time.time() + self.backoff
return False
elif next_state == self.StateRunning:
self.start_prepare = time.time() + self.backoff
return False
elif next_state == self.StateRunning:
+ # if this timer has been cancelled, just go to "end" state.
+ if self.cancelled:
+ return True
+
if self.justplay:
self.log(11, "zapping")
NavigationInstance.instance.playService(self.service_ref.ref)
if self.justplay:
self.log(11, "zapping")
NavigationInstance.instance.playService(self.service_ref.ref)
@@
-365,10
+370,6
@@
class RecordTimer(timer.Timer):
if time_match < diff:
time_match = diff
return time_match
if time_match < diff:
time_match = diff
return time_match
-
-
-
-
def removeEntry(self, entry):
print "[Timer] Remove " + str(entry)
def removeEntry(self, entry):
print "[Timer] Remove " + str(entry)