Add abstract class gMainDC as an interface for gFBDC and gSDLDC

[vuplus_dvbapp] / tests / enigma.py

diff --git a/tests/enigma.py b/tests/enigma.py
index c1f3bf6..e82aa49 100644 (file)
--- a/tests/enigma.py
+++ b/tests/enigma.py
@@ -25,8 +25,10 @@ class eTimer:
        def __init__(self):
                self.timeout = slot()
                self.next_activation = None
        def __init__(self):
                self.timeout = slot()
                self.next_activation = None

+               print "NEW TIMER"

        
        def start(self, msec, singleshot = False):
        
        def start(self, msec, singleshot = False):

+               print "start timer", msec

                self.next_activation = time.time() + msec / 1000.0
                self.msec = msec
                self.singleshot = singleshot
                self.next_activation = time.time() + msec / 1000.0
                self.msec = msec
                self.singleshot = singleshot


@@ -49,6 +51,8 @@ def runIteration():
        assert len(running_timers), "no running timers, so nothing will ever happen!"
        running_timers.sort(key=lambda x: x.next_activation)
        
        assert len(running_timers), "no running timers, so nothing will ever happen!"
        running_timers.sort(key=lambda x: x.next_activation)
        

+       print "running:", running_timers
+       

        next_timer = running_timers[0]
 
        now = time.time()
        next_timer = running_timers[0]
 
        now = time.time()


@@ -71,7 +75,7 @@ def stop():
 def run(duration = 1000):
        stoptimer = eTimer()
        stoptimer.start(duration * 1000.0)
 def run(duration = 1000):
        stoptimer = eTimer()
        stoptimer.start(duration * 1000.0)

-       stoptimer.timeout.get().append(stop)
+       stoptimer.callback.append(stop)

        while not stopped:
                runIteration()
 
        while not stopped:
                runIteration()
 


@@ -92,6 +96,7 @@ eWindowStyleSkinned = None
 eButton = None
 eListboxPythonStringContent = None
 eListbox = None
 eButton = None
 eListboxPythonStringContent = None
 eListbox = None

+eSubtitleWidget = None

 
 class eEPGCache:
        @classmethod
 
 class eEPGCache:
        @classmethod


@@ -127,6 +132,9 @@ class pNavigation:
        def playService(self, service):
                return None
 
        def playService(self, service):
                return None
 

+       def __repr__(self):
+               return "pNavigation"
+

 eRCInput = None
 getPrevAsciiCode = None
 
 eRCInput = None
 getPrevAsciiCode = None
 


@@ -276,7 +284,9 @@ eServiceCenter()
 
 ##################### ENIGMA CHROOT
 
 
 ##################### ENIGMA CHROOT
 

+print "import directories"

 import Tools.Directories
 import Tools.Directories

+print "done"

 
 chroot="."
 
 
 chroot="."
 


@@ -288,7 +298,9 @@ Tools.Directories.defaultPaths[Tools.Directories.SCOPE_CONFIG] = ("/etc/enigma2/
 
 ##################### ENIGMA CONFIG
 
 
 ##################### ENIGMA CONFIG
 

+print "import config"

 import Components.config
 import Components.config

+print "done"

 
 my_config = [
 "config.skin.primary_skin=None\n"
 
 my_config = [
 "config.skin.primary_skin=None\n"


@@ -306,14 +318,17 @@ class eActionMap:
 ##################### ENIGMA STARTUP:
 
 def init_nav():
 ##################### ENIGMA STARTUP:
 
 def init_nav():

+       print "init nav"

        import Navigation, NavigationInstance
        NavigationInstance.instance = Navigation.Navigation()
 
 def init_record_config():
        import Navigation, NavigationInstance
        NavigationInstance.instance = Navigation.Navigation()
 
 def init_record_config():

+       print "init recording"

        import Components.RecordingConfig
        Components.RecordingConfig.InitRecordingConfig()
 
 def init_parental_control():
        import Components.RecordingConfig
        Components.RecordingConfig.InitRecordingConfig()
 
 def init_parental_control():

+       print "init parental"

        from Components.ParentalControl import InitParentalControl
        InitParentalControl()
 
        from Components.ParentalControl import InitParentalControl
        InitParentalControl()
 


@@ -345,7 +360,5 @@ def init_all():
        import Components.RFmod
        Components.RFmod.InitRFmod()
 
        import Components.RFmod
        Components.RFmod.InitRFmod()
 

-       import Components.NimManager
-

        import Screens.Ci
        Screens.Ci.InitCiConfig()
        import Screens.Ci
        Screens.Ci.InitCiConfig()