add dump_malloc_stats

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 627d16fbf5990f2baa84fc3333f38647b740befc..e8e0c74c8649c1e845697778b45408c98b83e828 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,9 +1,14 @@
+import eBaseImpl
+import enigma
+enigma.eTimer = eBaseImpl.eTimer
+enigma.eSocketNotifier = eBaseImpl.eSocketNotifier
+
 from Tools.Profile import profile, profile_final
 
 profile("PYTHON_START")
 
 from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
-       getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent
+       getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent
 from tools import *
 
 profile("LANGUAGE")
@@ -94,14 +99,6 @@ def dump(dir, p = ""):
 
 # display
 
-class OutputDevice:
-       def create(self, screen): pass
-
-class GUIOutputDevice(OutputDevice):
-       parent = None
-       def create(self, comp, desktop):
-               comp.createGUIScreen(self.parent, desktop)
-
 profile("LOAD:ScreenGlobals")
 from Screens.Globals import Globals
 from Screens.SessionGlobals import SessionGlobals
@@ -141,7 +138,7 @@ class Session:
                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
 
@@ -244,20 +241,8 @@ class Session:
                # 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
 
@@ -350,7 +335,7 @@ class VolumeControl:
                self.muteDialog = session.instantiateDialog(Mute)
 
                self.hideVolTimer = eTimer()
-               self.hideVolTimer.timeout.get().append(self.volHide)
+               self.hideVolTimer.callback.append(self.volHide)
 
                vol = config.audio.volume.value
                self.volumeDialog.setValue(vol)
@@ -426,9 +411,9 @@ class PowerKey:
 
        def shutdown(self):
                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)
-               
+
        def powerlong(self):
                self.standbyblocked = 1
                action = config.usage.on_long_powerpress.value
@@ -511,7 +496,9 @@ def runScreenTest():
        profile("wizards")
        screensToRun += wizardManager.getWizards()
 
-       screensToRun.append(Screens.InfoBar.InfoBar)
+       screensToRun.append((100, Screens.InfoBar.InfoBar))
+
+       screensToRun.sort()
 
        ePythonConfigQuery.setQueryFunc(configfile.getResolvedKey)
 
@@ -526,7 +513,7 @@ def runScreenTest():
                        quitMainloop(*result)
                        return
 
-               screen = screensToRun[0]
+               screen = screensToRun[0][1]
 
                if len(screensToRun):
                        session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
@@ -619,6 +606,11 @@ profile("Init:CI")
 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()