X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=0f4256813aaa052c5a30542da1489eef0fa57d70;hp=6ae4d719136c229612008eb84b5c23ebe597b856;hb=f0f30b07354683b86bcb10d510f54f459fa8ca37;hpb=8c87d0c9772738df1005bd81a749d3fd6174c4cc

diff --git a/RecordTimer.py b/RecordTimer.py
index 6ae4d71..0f42568 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -482,27 +482,19 @@ class RecordTimer(timer.Timer):
 		file.close()
 
 	def getNextZapTime(self):
-		llen = len(self.timer_list)
-		idx = 0
 		now = time.time()
-		while idx < llen:
-			timer = self.timer_list[idx]
+		for timer in self.timer_list:
 			if not timer.justplay or timer.begin < now:
-				idx += 1
-			else:
-				return timer.begin
+				continue
+			return timer.begin
 		return -1
 
 	def getNextRecordingTime(self):
-		llen = len(self.timer_list)
-		idx = 0
 		now = time.time()
-		while idx < llen:
-			timer = self.timer_list[idx]
+		for timer in self.timer_list:
 			if timer.justplay or timer.begin < now:
-				idx += 1
-			else:
-				return timer.begin
+				continue
+			return timer.begin
 		return -1
 
 	def record(self, entry):
@@ -512,7 +504,6 @@ class RecordTimer(timer.Timer):
 		self.addTimerEntry(entry)
 		
 	def isInTimer(self, eventid, begin, duration, service):
-		print "isInTimer"
 		time_match = 0
 		chktime = None
 		chktimecmp = None