git.cweiske.de / enigma2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add missing file
[enigma2.git] / mytest.py
diff --git a/mytest.py b/mytest.py
old mode 100644 (file)
new mode 100755 (executable)
index 452dd3d..e42c100
--- a/mytest.py
+++ b/mytest.py
@@ -1,64 +1,107 @@
-from Tools import RedirectOutput, RedirectTime
-from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
-       getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent
+import eConsoleImpl
+import eBaseImpl
+import enigma
+enigma.eTimer = eBaseImpl.eTimer
+enigma.eSocketNotifier = eBaseImpl.eSocketNotifier
+enigma.eConsoleAppContainer = eConsoleImpl.eConsoleAppContainer
+
+from Tools.Profile import profile, profile_final
+
+profile("PYTHON_START")
+
+from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, \
+       getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent
 from tools import *
 
 from tools import *
 
+profile("LANGUAGE")
+
 from Components.Language import language
 
 def setEPGLanguage():
        print "language set to", language.getLanguage()
        eServiceEvent.setEPGLanguage(language.getLanguage())
 from Components.Language import language
 
 def setEPGLanguage():
        print "language set to", language.getLanguage()
        eServiceEvent.setEPGLanguage(language.getLanguage())
-       
+
 language.addCallback(setEPGLanguage)
 
 from traceback import print_exc
 language.addCallback(setEPGLanguage)
 
 from traceback import print_exc
+profile("LOAD:InfoBar")
 import Screens.InfoBar
 from Screens.SimpleSummary import SimpleSummary
 
 from sys import stdout, exc_info
 
 import Screens.InfoBar
 from Screens.SimpleSummary import SimpleSummary
 
 from sys import stdout, exc_info
 
-import ServiceReference
-
+profile("ParentalControl")
 from Components.ParentalControl import InitParentalControl
 InitParentalControl()
 
 from Components.ParentalControl import InitParentalControl
 InitParentalControl()
 
+profile("LOAD:Navigation")
 from Navigation import Navigation
 
 from Navigation import Navigation
 
-from skin import readSkin, applyAllAttributes
+profile("LOAD:skin")
+from skin import readSkin
 
 
+profile("LOAD:Tools")
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger
+from Components.config import config, configfile, ConfigText, ConfigYesNo, ConfigInteger, NoSave
 InitFallbackFiles()
 InitFallbackFiles()
+
+profile("ReloadProfiles")
 eDVBDB.getInstance().reloadBouquets()
 
 config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi")
 eDVBDB.getInstance().reloadBouquets()
 
 config.misc.radiopic = ConfigText(default = resolveFilename(SCOPE_SKIN_IMAGE)+"radio.mvi")
+config.misc.isNextRecordTimerAfterEventActionAuto = ConfigYesNo(default=False)
+config.misc.useTransponderTime = ConfigYesNo(default=True)
+config.misc.startCounter = ConfigInteger(default=0) # number of e2 starts...
+config.misc.standbyCounter = NoSave(ConfigInteger(default=0)) # number of standby
+
+#demo code for use of standby enter leave callbacks
+#def leaveStandby():
+#      print "!!!!!!!!!!!!!!!!!leave standby"
+
+#def standbyCountChanged(configElement):
+#      print "!!!!!!!!!!!!!!!!!enter standby num", configElement.value
+#      from Screens.Standby import inStandby
+#      inStandby.onClose.append(leaveStandby)
 
 
+#config.misc.standbyCounter.addNotifier(standbyCountChanged, initial_call = False)
+####################################################
+
+def useTransponderTimeChanged(configElement):
+       enigma.eDVBLocalTimeHandler.getInstance().setUseDVBTime(configElement.value)
+config.misc.useTransponderTime.addNotifier(useTransponderTimeChanged)
+
+profile("Twisted")
 try:
 try:
-       import e2reactor
-       e2reactor.install()
-       
        import twisted.python.runtime
        twisted.python.runtime.platform.supportsThreads = lambda: False
        import twisted.python.runtime
        twisted.python.runtime.platform.supportsThreads = lambda: False
-       
+
+       import e2reactor
+       e2reactor.install()
+
        from twisted.internet import reactor
        from twisted.internet import reactor
-       
+
        def runReactor():
        def runReactor():
-               reactor.run()
+               reactor.run(installSignalHandlers=False)
 except ImportError:
        print "twisted not available"
        def runReactor():
                runMainloop()
 
 except ImportError:
        print "twisted not available"
        def runReactor():
                runMainloop()
 
+profile("LOAD:Plugin")
+
 # initialize autorun plugins and plugin menu entries
 from Components.PluginComponent import plugins
 
 # initialize autorun plugins and plugin menu entries
 from Components.PluginComponent import plugins
 
+profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
 from Screens.Wizard import wizardManager
-from Screens.ImageWizard import *
+from Screens.DefaultWizard import *
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
+import Screens.Rc
 from Tools.BoundFunction import boundFunction
 from Plugins.Plugin import PluginDescriptor
 
 from Tools.BoundFunction import boundFunction
 from Plugins.Plugin import PluginDescriptor
 
+profile("misc")
 had = dict()
 
 def dump(dir, p = ""):
 had = dict()
 
 def dump(dir, p = ""):
@@ -79,21 +122,13 @@ def dump(dir, p = ""):
 
 # display
 
 
 # display
 
-class OutputDevice:
-       def create(self, screen): pass
-
-# display: HTML
-
-class HTMLOutputDevice(OutputDevice):
-       def create(self, comp):
-               print comp.produceHTML()
+profile("LOAD:ScreenGlobals")
+from Screens.Globals import Globals
+from Screens.SessionGlobals import SessionGlobals
+from Screens.Screen import Screen
 
 
-html = HTMLOutputDevice()
-
-class GUIOutputDevice(OutputDevice):
-       parent = None
-       def create(self, comp, desktop):
-               comp.createGUIScreen(self.parent, desktop)
+profile("Screen")
+Screen.global_screen = Globals()
 
 # Session.open:
 # * push current active dialog ('current_dialog') onto stack
 
 # Session.open:
 # * push current active dialog ('current_dialog') onto stack
@@ -126,19 +161,21 @@ class Session:
                self.summary_desktop = summary_desktop
                self.nav = navigation
                self.delay_timer = eTimer()
                self.summary_desktop = summary_desktop
                self.nav = navigation
                self.delay_timer = eTimer()
-               self.delay_timer.timeout.get().append(self.processDelay)
-               
+               self.delay_timer.callback.append(self.processDelay)
+
                self.current_dialog = None
                self.current_dialog = None
-               
+
                self.dialog_stack = [ ]
                self.summary_stack = [ ]
                self.summary = None
                self.dialog_stack = [ ]
                self.summary_stack = [ ]
                self.summary = None
-               
+
                self.in_exec = False
                self.in_exec = False
-               
+
+               self.screen = SessionGlobals(self)
+
                for p in plugins.getPlugins(PluginDescriptor.WHERE_SESSIONSTART):
                        p(reason=0, session=self)
                for p in plugins.getPlugins(PluginDescriptor.WHERE_SESSIONSTART):
                        p(reason=0, session=self)
-       
+
        def processDelay(self):
                callback = self.current_dialog.callback
 
        def processDelay(self):
                callback = self.current_dialog.callback
 
@@ -150,7 +187,7 @@ class Session:
                        del self.current_dialog
                else:
                        del self.current_dialog.callback
                        del self.current_dialog
                else:
                        del self.current_dialog.callback
-               
+
                self.popCurrent()
                if callback is not None:
                        callback(*retval)
                self.popCurrent()
                if callback is not None:
                        callback(*retval)
@@ -173,11 +210,7 @@ class Session:
 
                # when execBegin opened a new dialog, don't bother showing the old one.
                if c == self.current_dialog and do_show:
 
                # when execBegin opened a new dialog, don't bother showing the old one.
                if c == self.current_dialog and do_show:
-                       # this is the first show() for each screen.
-                       # screen.shown is already true, because that resembles the state 
-                       # ("not-yet-shown-but-will-be-shown") best, so c.show() would just do nothing.
-                       # show(force=True) will show in any case.
-                       c.show(force = True)
+                       c.show()
 
        def execEnd(self, last=True):
                assert self.in_exec
 
        def execEnd(self, last=True):
                assert self.in_exec
@@ -185,11 +218,11 @@ class Session:
 
                self.current_dialog.execEnd()
                self.current_dialog.hide()
 
                self.current_dialog.execEnd()
                self.current_dialog.hide()
-               
+
                if last:
                        self.current_dialog.removeSummary(self.summary)
                        self.popSummary()
                if last:
                        self.current_dialog.removeSummary(self.summary)
                        self.popSummary()
-       
+
        def create(self, screen, arguments, **kwargs):
                # creates an instance of 'screen' (which is a class)
                try:
        def create(self, screen, arguments, **kwargs):
                # creates an instance of 'screen' (which is a class)
                try:
@@ -199,20 +232,20 @@ class Session:
                        print errstr
                        print_exc(file=stdout)
                        quitMainloop(5)
                        print errstr
                        print_exc(file=stdout)
                        quitMainloop(5)
-       
+
        def instantiateDialog(self, screen, *arguments, **kwargs):
                return self.doInstantiateDialog(screen, arguments, kwargs, self.desktop)
        def instantiateDialog(self, screen, *arguments, **kwargs):
                return self.doInstantiateDialog(screen, arguments, kwargs, self.desktop)
-       
+
        def deleteDialog(self, screen):
                screen.hide()
                screen.doClose()
        def deleteDialog(self, screen):
                screen.hide()
                screen.doClose()
-       
+
        def instantiateSummaryDialog(self, screen, *arguments, **kwargs):
                return self.doInstantiateDialog(screen, arguments, kwargs, self.summary_desktop)
        def instantiateSummaryDialog(self, screen, *arguments, **kwargs):
                return self.doInstantiateDialog(screen, arguments, kwargs, self.summary_desktop)
-       
+
        def doInstantiateDialog(self, screen, arguments, kwargs, desktop):
                # create dialog
        def doInstantiateDialog(self, screen, arguments, kwargs, desktop):
                # create dialog
-               
+
                try:
                        dlg = self.create(screen, arguments, **kwargs)
                except:
                try:
                        dlg = self.create(screen, arguments, **kwargs)
                except:
@@ -221,7 +254,7 @@ class Session:
                        print_exc(file=stdout)
                        quitMainloop(5)
                        print '-'*60
                        print_exc(file=stdout)
                        quitMainloop(5)
                        print '-'*60
-               
+
                if dlg is None:
                        return
 
                if dlg is None:
                        return
 
@@ -230,31 +263,19 @@ class Session:
 
                # create GUI view of this dialog
                assert desktop is not None
 
                # create GUI view of this dialog
                assert desktop is not None
-               
-               z = 0
-               title = ""
-               for (key, value) in dlg.skinAttributes:
-                       if key == "zPosition":
-                               z = int(value)
-                       elif key == "title":
-                               title = value
-               
-               dlg.instance = eWindow(desktop, z)
-               dlg.title = title
-               applyAllAttributes(dlg.instance, desktop, dlg.skinAttributes)
-               gui = GUIOutputDevice()
-               gui.parent = dlg.instance
-               gui.create(dlg, desktop)
-               
+
+               dlg.setDesktop(desktop)
+               dlg.applySkin()
+
                return dlg
                return dlg
-        
+
        def pushCurrent(self):
                if self.current_dialog is not None:
                        self.dialog_stack.append((self.current_dialog, self.current_dialog.shown))
                        self.execEnd(last=False)
 
        def popCurrent(self):
        def pushCurrent(self):
                if self.current_dialog is not None:
                        self.dialog_stack.append((self.current_dialog, self.current_dialog.shown))
                        self.execEnd(last=False)
 
        def popCurrent(self):
-               if len(self.dialog_stack):
+               if self.dialog_stack:
                        (self.current_dialog, do_show) = self.dialog_stack.pop()
                        self.execBegin(first=False, do_show=do_show)
                else:
                        (self.current_dialog, do_show) = self.dialog_stack.pop()
                        self.execBegin(first=False, do_show=do_show)
                else:
@@ -273,10 +294,10 @@ class Session:
                return dlg
 
        def open(self, screen, *arguments, **kwargs):
                return dlg
 
        def open(self, screen, *arguments, **kwargs):
-               if len(self.dialog_stack) and not self.in_exec:
-                       raise "modal open are allowed only from a screen which is modal!"
+               if self.dialog_stack and not self.in_exec:
+                       raise RuntimeError("modal open are allowed only from a screen which is modal!")
                        # ...unless it's the very first screen.
                        # ...unless it's the very first screen.
-               
+
                self.pushCurrent()
                dlg = self.current_dialog = self.instantiateDialog(screen, *arguments, **kwargs)
                dlg.isTmp = True
                self.pushCurrent()
                dlg = self.current_dialog = self.instantiateDialog(screen, *arguments, **kwargs)
                dlg.isTmp = True
@@ -288,7 +309,7 @@ class Session:
                if not self.in_exec:
                        print "close after exec!"
                        return
                if not self.in_exec:
                        print "close after exec!"
                        return
-               
+
                # be sure that the close is for the right dialog!
                # if it's not, you probably closed after another dialog
                # was opened. this can happen if you open a dialog
                # be sure that the close is for the right dialog!
                # if it's not, you probably closed after another dialog
                # was opened. this can happen if you open a dialog
@@ -297,7 +318,7 @@ class Session:
                # gain focus again (for a short time), thus triggering
                # the onExec, which opens the dialog again, closing the loop.
                assert screen == self.current_dialog
                # gain focus again (for a short time), thus triggering
                # the onExec, which opens the dialog again, closing the loop.
                assert screen == self.current_dialog
-               
+
                self.current_dialog.returnValue = retval
                self.delay_timer.start(0, 1)
                self.execEnd()
                self.current_dialog.returnValue = retval
                self.delay_timer.start(0, 1)
                self.execEnd()
@@ -315,121 +336,64 @@ class Session:
                if self.summary is not None:
                        self.summary.show()
 
                if self.summary is not None:
                        self.summary.show()
 
-from Screens.Volume import Volume
-from Screens.Mute import Mute
-from GlobalActions import globalActionMap
-
-#TODO .. move this to a own .py file
-class VolumeControl:
-       """Volume control, handles volUp, volDown, volMute actions and display
-       a corresponding dialog"""
-       def __init__(self, session):
-               global globalActionMap
-               globalActionMap.actions["volumeUp"]=self.volUp
-               globalActionMap.actions["volumeDown"]=self.volDown
-               globalActionMap.actions["volumeMute"]=self.volMute
-
-               config.audio = ConfigSubsection()
-               config.audio.volume = ConfigInteger(default = 100, limits = (0, 100))
-
-               self.volumeDialog = session.instantiateDialog(Volume)
-               self.muteDialog = session.instantiateDialog(Mute)
-
-               self.hideVolTimer = eTimer()
-               self.hideVolTimer.timeout.get().append(self.volHide)
-
-               vol = config.audio.volume.value
-               self.volumeDialog.setValue(vol)
-               self.volctrl = eDVBVolumecontrol.getInstance()
-               self.volctrl.setVolume(vol, vol)
-
-       def volSave(self):
-               if self.volctrl.isMuted():
-                       config.audio.volume.value = 0
-               else:
-                       config.audio.volume.value = self.volctrl.getVolume()
-               config.audio.volume.save()
-
-       def volUp(self):
-               self.setVolume(+1)
-
-       def volDown(self):
-               self.setVolume(-1)
-
-       def setVolume(self, direction):
-               oldvol = self.volctrl.getVolume()
-               if direction > 0:
-                       self.volctrl.volumeUp()
-               else:
-                       self.volctrl.volumeDown()
-               is_muted = self.volctrl.isMuted()
-               vol = self.volctrl.getVolume()
-               self.volumeDialog.show()
-               if is_muted:
-                       self.volMute() # unmute
-               elif not vol:
-                       self.volMute(False, True) # mute but dont show mute symbol
-               if self.volctrl.isMuted():
-                       self.volumeDialog.setValue(0)
-               else:
-                       self.volumeDialog.setValue(self.volctrl.getVolume())
-               self.volSave()
-               self.hideVolTimer.start(3000, True)
-
-       def volHide(self):
-               self.volumeDialog.hide()
-
-       def volMute(self, showMuteSymbol=True, force=False):
-               vol = self.volctrl.getVolume()
-               if vol or force:
-                       self.volctrl.volumeToggleMute()
-                       if self.volctrl.isMuted():
-                               if showMuteSymbol:
-                                       self.muteDialog.show()
-                               self.volumeDialog.setValue(0)
-                       else:
-                               self.muteDialog.hide()
-                               self.volumeDialog.setValue(vol)
-
+profile("Standby,PowerKey")
 import Screens.Standby
 import Screens.Standby
+from Screens.Menu import MainMenu, mdom
+from GlobalActions import globalActionMap
 
 class PowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""
 
 class PowerKey:
        """ PowerKey stuff - handles the powerkey press and powerkey release actions"""
-       
+
        def __init__(self, session):
                self.session = session
        def __init__(self, session):
                self.session = session
-               self.powerKeyTimer = eTimer()
-               self.powerKeyTimer.timeout.get().append(self.powertimer)
-               globalActionMap.actions["powerdown"]=self.powerdown
-               globalActionMap.actions["powerup"]=self.powerup
+               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
                self.standbyblocked = 1
-#              self["PowerKeyActions"] = HelpableActionMap(self, "PowerKeyActions",
-                       #{
-                               #"powerdown": self.powerdown,
-                               #"powerup": self.powerup,
-                               #"discreteStandby": (self.standby, "Go standby"),
-                               #"discretePowerOff": (self.quit, "Go to deep standby"),
-                       #})
-
-       def powertimer(self):   
+
+       def MenuClosed(self, *val):
+               self.session.infobar = None
+
+       def shutdown(self):
                print "PowerOff - Now!"
                print "PowerOff - Now!"
-               if not Screens.Standby.inTryQuitMainloop:
+               if not Screens.Standby.inTryQuitMainloop and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
                        self.session.open(Screens.Standby.TryQuitMainloop, 1)
                        self.session.open(Screens.Standby.TryQuitMainloop, 1)
-       
+
+       def powerlong(self):
+               if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
+                       return
+
+               self.standbyblocked = 1
+               action = config.usage.on_long_powerpress.value
+               if action == "shutdown":
+                       self.shutdown()
+               elif action == "show_menu":
+                       print "Show shutdown Menu"
+                       root = mdom.getroot()
+                       for x in root.findall("menu"):
+                               y = x.find("id")
+                               if y is not None:
+                                       id = y.get("val")
+                                       if id and id == "shutdown":
+                                               self.session.infobar = self
+                                               menu_screen = self.session.openWithCallback(self.MenuClosed, MainMenu, x)
+                                               menu_screen.setTitle(_("Standby / Restart"))
+                                               return
+
        def powerdown(self):
                self.standbyblocked = 0
        def powerdown(self):
                self.standbyblocked = 0
-               self.powerKeyTimer.start(3000, True)
 
        def powerup(self):
 
        def powerup(self):
-               self.powerKeyTimer.stop()
                if self.standbyblocked == 0:
                        self.standbyblocked = 1
                        self.standby()
 
        def standby(self):
                if self.standbyblocked == 0:
                        self.standbyblocked = 1
                        self.standby()
 
        def standby(self):
-               if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
+               if not Screens.Standby.inStandby and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND and self.session.in_exec:
                        self.session.open(Screens.Standby.Standby)
 
                        self.session.open(Screens.Standby.Standby)
 
+profile("Scart")
 from Screens.Scart import Scart
 
 class AutoScartControl:
 from Screens.Scart import Scart
 
 class AutoScartControl:
@@ -455,21 +419,33 @@ class AutoScartControl:
                        else:
                                self.scartDialog.switchToTV()
 
                        else:
                                self.scartDialog.switchToTV()
 
+profile("Load:CI")
 from enigma import eDVBCIInterfaces
 from enigma import eDVBCIInterfaces
+from Screens.Ci import CiHandler
+
+profile("Load:VolumeControl")
+from Components.VolumeControl import VolumeControl
 
 def runScreenTest():
 
 def runScreenTest():
+       config.misc.startCounter.value += 1
+
+       profile("readPluginList")
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
        plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
-       session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = Navigation())
-       
-       screensToRun = [ ]
-       
-       for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
-               screensToRun.append(p.__call__)
-       
+       profile("Init:Session")
+       nav = Navigation(config.misc.isNextRecordTimerAfterEventActionAuto.value)
+       session = Session(desktop = getDesktop(0), summary_desktop = getDesktop(1), navigation = nav)
+
+       CiHandler.setSession(session)
+
+       screensToRun = [ p.__call__ for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD) ]
+
+       profile("wizards")
        screensToRun += wizardManager.getWizards()
        screensToRun += wizardManager.getWizards()
-       
-       screensToRun.append(Screens.InfoBar.InfoBar)
+
+       screensToRun.append((100, Screens.InfoBar.InfoBar))
+
+       screensToRun.sort()
 
        ePythonConfigQuery.setQueryFunc(configfile.getResolvedKey)
 
 
        ePythonConfigQuery.setQueryFunc(configfile.getResolvedKey)
 
@@ -483,88 +459,125 @@ def runScreenTest():
                if result:
                        quitMainloop(*result)
                        return
                if result:
                        quitMainloop(*result)
                        return
-       
-               screen = screensToRun[0]
-               
-               if len(screensToRun):
-                       session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
+
+               screen = screensToRun[0][1]
+               args = screensToRun[0][2:]
+
+               if screensToRun:
+                       session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen, *args)
                else:
                else:
-                       session.open(screen)
-       
+                       session.open(screen, *args)
+
        runNextScreen(session, screensToRun)
        runNextScreen(session, screensToRun)
-       
+
+       profile("Init:VolumeControl")
        vol = VolumeControl(session)
        vol = VolumeControl(session)
+       profile("Init:PowerKey")
        power = PowerKey(session)
 
        # we need session.scart to access it from within menu.xml
        session.scart = AutoScartControl(session)
 
        power = PowerKey(session)
 
        # we need session.scart to access it from within menu.xml
        session.scart = AutoScartControl(session)
 
+       profile("RunReactor")
+       profile_final()
        runReactor()
        runReactor()
-       
-       configfile.save()
 
 
-       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()
+       config.misc.startCounter.save()
+
+       profile("wakeup")
+       from time import time, strftime, localtime
+       from Tools.DreamboxHardware import setFPWakeuptime, getFPWakeuptime, setRTCtime
        #get currentTime
        nowTime = time()
        #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
+       wakeupList = [
+               x for x in ((session.nav.RecordTimer.getNextRecordingTime(), 0, session.nav.RecordTimer.isNextRecordAfterEventActionAuto()),
+                                       (session.nav.RecordTimer.getNextZapTime(), 1),
+                                       (plugins.getNextWakeupTime(), 2))
+               if x[0] != -1
+       ]
+       wakeupList.sort()
+       recordTimerWakeupAuto = False
+       if wakeupList:
+               from time import strftime
+               startTime = wakeupList[0]
+               if (startTime[0] - nowTime) < 270: # no time to switch box back on
+                       wptime = nowTime + 30  # so switch back on in 30 seconds
                else:
                else:
-                       setFPWakeuptime(startTime - 300)
+                       wptime = startTime[0] - 240
+               if not config.misc.useTransponderTime.value:
+                       print "dvb time sync disabled... so set RTC now to current linux time!", strftime("%Y/%m/%d %H:%M", localtime(nowTime))
+                       setRTCtime(nowTime)
+               print "set wakeup time to", strftime("%Y/%m/%d %H:%M", localtime(wptime))
+               setFPWakeuptime(wptime)
+               recordTimerWakeupAuto = startTime[1] == 0 and startTime[2]
+       config.misc.isNextRecordTimerAfterEventActionAuto.value = recordTimerWakeupAuto
+       config.misc.isNextRecordTimerAfterEventActionAuto.save()
+
+       profile("stopService")
        session.nav.stopService()
        session.nav.stopService()
+       profile("nav shutdown")
        session.nav.shutdown()
        session.nav.shutdown()
-       
+
+       profile("configfile.save")
+       configfile.save()
+
        return 0
 
        return 0
 
-import keymapparser
-keymapparser.readKeymap()
+profile("Init:skin")
 import skin
 skin.loadSkinData(getDesktop(0))
 
 import skin
 skin.loadSkinData(getDesktop(0))
 
+profile("InputDevice")
 import Components.InputDevice
 Components.InputDevice.InitInputDevices()
 
 import Components.InputDevice
 Components.InputDevice.InitInputDevices()
 
+profile("AVSwitch")
 import Components.AVSwitch
 Components.AVSwitch.InitAVSwitch()
 
 import Components.AVSwitch
 Components.AVSwitch.InitAVSwitch()
 
+profile("RecordingConfig")
 import Components.RecordingConfig
 Components.RecordingConfig.InitRecordingConfig()
 
 import Components.RecordingConfig
 Components.RecordingConfig.InitRecordingConfig()
 
+profile("UsageConfig")
 import Components.UsageConfig
 Components.UsageConfig.InitUsageConfig()
 
 import Components.UsageConfig
 Components.UsageConfig.InitUsageConfig()
 
+profile("keymapparser")
+import keymapparser
+keymapparser.readKeymap(config.usage.keymap.value)
+
+profile("Network")
 import Components.Network
 Components.Network.InitNetwork()
 
 import Components.Network
 Components.Network.InitNetwork()
 
+profile("LCD")
 import Components.Lcd
 Components.Lcd.InitLcd()
 
 import Components.Lcd
 Components.Lcd.InitLcd()
 
+profile("SetupDevices")
 import Components.SetupDevices
 Components.SetupDevices.InitSetupDevices()
 
 import Components.SetupDevices
 Components.SetupDevices.InitSetupDevices()
 
+profile("RFMod")
 import Components.RFmod
 Components.RFmod.InitRFmod()
 
 import Components.RFmod
 Components.RFmod.InitRFmod()
 
-import Components.NimManager
-
+profile("Init:CI")
 import Screens.Ci
 Screens.Ci.InitCiConfig()
 
 import Screens.Ci
 Screens.Ci.InitCiConfig()
 
+#from enigma import dump_malloc_stats
+#t = eTimer()
+#t.callback.append(dump_malloc_stats)
+#t.start(1000)
+
 # first, setup a screen
 try:
        runScreenTest()
 
        plugins.shutdown()
 # first, setup a screen
 try:
        runScreenTest()
 
        plugins.shutdown()
-       
+
        from Components.ParentalControl import parentalControl
        parentalControl.save()
 except:
        from Components.ParentalControl import parentalControl
        parentalControl.save()
 except:
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources