X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=timer.py;h=a912f1c629c0ae4b8f394ad2b61359955810da99;hb=f7672781a51e8a21ccbd48ce53a72ad61f5d5e7e;hp=3caa288db0a81cd2e56b04756175d02bf2774d9c;hpb=28a8b65725c90de53f1d0bfc7ab8fb713d9dac27;p=vuplus_dvbapp

diff --git a/timer.py b/timer.py
index 3caa288..a912f1c 100644
--- a/timer.py
+++ b/timer.py
@@ -88,6 +88,12 @@ class TimerEntry:
 	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.
@@ -131,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"
+			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:
@@ -169,12 +178,16 @@ class 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)
 
+		# give the timer a chance to re-enqueue
+		if timer.state == TimerEntry.StateEnded:
+			timer.state = TimerEntry.StateWaiting
 		self.addTimerEntry(timer)
 	
 	def doActivate(self, w):