X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9ddb6ca949731ad0f510602b012ee0b2ea53890f..ec55d380cf26ce2d8c14ec0167f97927a8f46d40:/timer.py

diff --git a/timer.py b/timer.py
index 6f3a05fb..fd5bb5af 100644
--- a/timer.py
+++ b/timer.py
@@ -3,6 +3,8 @@ from time import strftime, time, localtime, mktime
 from enigma import eTimer
 import datetime
 
+import NavigationInstance
+
 class TimerEntry:
 	StateWaiting  = 0
 	StatePrepared = 1
@@ -21,7 +23,13 @@ class TimerEntry:
 		self.backoff = 0
 		
 		self.disabled = False
-		
+
+	def resetState(self):
+		self.state = self.StateWaiting
+		self.cancelled = False
+		self.first_try_prepare = True
+		self.timeChanged()
+
 	def resetRepeated(self):
 		self.repeated = int(0)
 
@@ -58,7 +66,7 @@ class TimerEntry:
 
 			day = []
 			flags = self.repeated
-			for x in range(0, 7):
+			for x in (0, 1, 2, 3, 4, 5, 6):
 				if (flags & 1 == 1):
 					day.append(0)
 					print "Day: " + str(x)
@@ -139,7 +147,7 @@ class Timer:
 		self.processed_timers = [ ]
 		
 		self.timer = eTimer()
-		self.timer.timeout.get().append(self.calcNextActivation)
+		self.timer.callback.append(self.calcNextActivation)
 		self.lastActivation = time()
 		
 		self.calcNextActivation()
@@ -169,6 +177,27 @@ class Timer:
 			insort(self.timer_list, entry)
 			if not noRecalc:
 				self.calcNextActivation()
+
+# small piece of example code to understand how to use record simulation
+#		if NavigationInstance.instance:
+#			lst = [ ]
+#			cnt = 0
+#			for timer in self.timer_list:
+#				print "timer", cnt
+#				cnt += 1
+#				if timer.state == 0: #waiting
+#					lst.append(NavigationInstance.instance.recordService(timer.service_ref))
+#				else:
+#					print "STATE: ", timer.state
+#
+#			for rec in lst:
+#				if rec.start(True): #simulate
+#					print "FAILED!!!!!!!!!!!!"
+#				else:
+#					print "OK!!!!!!!!!!!!!!"
+#				NavigationInstance.instance.stopRecordService(rec)
+#		else:
+#			print "no NAV"
 	
 	def setNextActivation(self, when):
 		delay = int((when - time()) * 1000)