add VideoTune plugin

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 79dd6277a2e5dff5e480683859af9be32d536447..3bdbcf2d63b94edad399440df75d202937f19a55 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -404,18 +404,22 @@ class PowerKey:
                globalActionMap.actions["power_down"]=self.powerdown
                globalActionMap.actions["power_up"]=self.powerup
                globalActionMap.actions["power_long"]=self.powerlong
+               globalActionMap.actions["deepstandby"]=self.shutdown # frontpanel long power button press
                self.standbyblocked = 1
 
        def MenuClosed(self, *val):
                self.session.infobar = None
 
+       def shutdown(self):
+               print "PowerOff - Now!"
+               if not Screens.Standby.inTryQuitMainloop:
+                       self.session.open(Screens.Standby.TryQuitMainloop, 1)
+               
        def powerlong(self):
                self.standbyblocked = 1
                action = config.usage.on_long_powerpress.value
                if action == "shutdown":
-                       print "PowerOff - Now!"
-                       if not Screens.Standby.inTryQuitMainloop:
-                               self.session.open(Screens.Standby.TryQuitMainloop, 1)
+                       self.shutdown()
                elif action == "show_menu":
                        print "Show shutdown Menu"
                        menu = mdom.childNodes[0]
@@ -430,8 +434,8 @@ class PowerKey:
                                                        id = y.getAttribute("val")
                                                        if id and id == "shutdown":
                                                                self.session.infobar = self
-                                                               menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, menu, x.childNodes)
-                                                               menu_screen.setTitle(_("Standby Menu"))
+                                                               menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x, x.childNodes)
+                                                               menu_screen.setTitle(_("Standby / Restart"))
                                                                return
 
        def powerdown(self):
@@ -472,12 +476,15 @@ class AutoScartControl:
                                self.scartDialog.switchToTV()
 
 from enigma import eDVBCIInterfaces
+from Screens.Ci import CiHandler
 
 def runScreenTest():
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
        session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
 
+       CiHandler.setSession(session)
+
        screensToRun = [ ]
 
        for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
@@ -521,17 +528,18 @@ def runScreenTest():
 
        from time import time
        from Tools.DreamboxHardware import setFPWakeuptime
-       #get next record timer start time
-       nextRecordingTime = session.nav.RecordTimer.getNextRecordingTime()
-       #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:
+       wakeupList = [
+               x for x in
+                               [session.nav.RecordTimer.getNextRecordingTime(),
+                               session.nav.RecordTimer.getNextZapTime(),
+                               plugins.getNextWakeupTime()]
+               if x != -1
+       ]
+       wakeupList.sort()
+       if len(wakeupList):
+               startTime = wakeupList.pop(0)
                if (startTime - nowTime < 330): # no time to switch box back on
                        setFPWakeuptime(nowTime + 30) # so switch back on in 30 seconds
                else: