git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add repeating zap timers is now possible
[enigma2.git]
/
RecordTimer.py
diff --git
a/RecordTimer.py
b/RecordTimer.py
index 386e03f06da3841063b3b5b063c5af81a87f7c82..6c942fb10720fc19525e522a793a0d24875f601f 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()
@@
-108,7
+109,7
@@
class RecordTimerEntry(timer.TimerEntry):
f.write(self.description + "\n")
f.write(str(self.begin) + "\n")
f.close()
f.write(self.description + "\n")
f.write(str(self.begin) + "\n")
f.close()
- except:
+ except
IOError
:
self.log(4, "failed to write meta information")
return True
self.log(4, "failed to write meta information")
return True
@@
-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)
@@
-237,7
+242,7
@@
class RecordTimer(timer.Timer):
def isRecording(self):
isRunning = False
for timer in self.timer_list:
def isRecording(self):
isRunning = False
for timer in self.timer_list:
- if timer.isRunning():
+ if timer.isRunning()
and not timer.justplay
:
isRunning = True
return isRunning
isRunning = True
return isRunning
@@
-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)