X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=mytest.py;h=e674a29515e194857ff81ae2e40d4f967551fcb7;hb=d6df38ffdd575880994170db75ce93480fb618f8;hp=7d87a9cd63daef035733229955b0d6f366f39f6b;hpb=0dbb36049c5f14bbabc4596448dc148f108a2137;p=vuplus_dvbapp

diff --git a/mytest.py b/mytest.py
index 7d87a9c..e674a29 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,6 +1,6 @@
-from Tools import RedirectOutput
+from Tools import RedirectOutput, RedirectTime
 from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
-	getDesktop, ePythonConfigQuery, eAVSwitch, eWindow
+	getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent
 from tools import *
 
 from Components.Language import language
@@ -493,13 +493,21 @@ def runScreenTest():
 
 	from time import time
 	from Tools.DreamboxHardware import setFPWakeuptime
+	#get next record timer start time
 	nextRecordingTime = session.nav.RecordTimer.getNextRecordingTime()
-	if nextRecordingTime != -1:
-		if (nextRecordingTime - time() < 330): # no time to switch box back on
-			setFPWakeuptime(time() + 30) # so switch back on in 30 seconds
+	#get next zap timer start time
+	nextZapTime = session.nav.RecordTimer.getNextZapTime()
+	#get currentTime
+	nowTime = time()
+	if nextZapTime != -1 and nextRecordingTime != -1:
+		startTime = nextZapTime < nextRecordingTime and nextZapTime or nextRecordingTime
+	else:
+		startTime = nextZapTime != -1 and nextZapTime or nextRecordingTime
+	if startTime != -1:
+		if (startTime - nowTime < 330): # no time to switch box back on
+			setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds
 		else:
-			setFPWakeuptime(nextRecordingTime - (300))
-	
+			setFPWakeuptime(startTime - 300)
 	session.nav.stopService()
 	session.nav.shutdown()