avswitch: reset video mode only when it has changed

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 13eb4a7eb744f85e1fcb60703289c64a6c2924af..d71f457ed8333a8e9834ca3c4079f77eb2b08b4e 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,3 +1,4 @@
+from Tools import RedirectOutput
 from enigma import *
 from tools import *
 
@@ -110,11 +111,11 @@ class Session:
 
                # when execBegin opened a new dialog, don't bother showing the old one.
                if c == self.currentDialog:
-                       c.instance.show()
+                       c.show()
                
        def execEnd(self):
                self.currentDialog.execEnd()
-               self.currentDialog.instance.hide()
+               self.currentDialog.hide()
        
        def create(self, screen, arguments):
                # creates an instance of 'screen' (which is a class)
@@ -153,7 +154,7 @@ class Session:
                        if key == "zPosition":
                                z = int(value)
 
-               dlg.instance = eWindow(self.desktop, -z)
+               dlg.instance = eWindow(self.desktop, z)
                applyAllAttributes(dlg.instance, self.desktop, dlg.skinAttributes)
                gui = GUIOutputDevice()
                gui.parent = dlg.instance
@@ -199,6 +200,68 @@ class Session:
                self.currentDialog.returnValue = retval
                self.delayTimer.start(0, 1)
 
+from Screens.Volume import Volume
+from Screens.Mute import Mute
+from GlobalActions import globalActionMap
+from Components.config import ConfigSubsection, configSequence, configElement, configsequencearg
+
+#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 = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (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[0]
+               self.volumeDialog.setValue(vol)
+               eDVBVolumecontrol.getInstance().setVolume(vol, vol)
+
+       def volSave(self):
+               config.audio.volume.value = eDVBVolumecontrol.getInstance().getVolume()
+               config.audio.volume.save()
+
+       def     volUp(self):
+               if (eDVBVolumecontrol.getInstance().isMuted()):
+                       self.volMute()
+               eDVBVolumecontrol.getInstance().volumeUp()
+               self.volumeDialog.show()
+               self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               self.volSave()
+               self.hideVolTimer.start(3000, True)
+
+       def     volDown(self):
+               if (eDVBVolumecontrol.getInstance().isMuted()):
+                       self.volMute()
+               eDVBVolumecontrol.getInstance().volumeDown()
+               self.volumeDialog.show()
+               self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               self.volSave()
+               self.hideVolTimer.start(3000, True)
+
+       def volHide(self):
+               self.volumeDialog.hide()
+
+       def     volMute(self):
+               eDVBVolumecontrol.getInstance().volumeToggleMute()
+               self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+
+               if (eDVBVolumecontrol.getInstance().isMuted()):
+                       self.muteDialog.show()
+               else:
+                       self.muteDialog.hide()
+
 def runScreenTest():
        session = Session()
        session.desktop = getDesktop()
@@ -207,11 +270,11 @@ def runScreenTest():
        
        screensToRun = wizardManager.getWizards()
        screensToRun.append(Screens.InfoBar.InfoBar)
-       
+
        def runNextScreen(session, screensToRun, *result):
                if result:
                        quitMainloop(result)
-
+       
                screen = screensToRun[0]
                
                if len(screensToRun):
@@ -220,9 +283,11 @@ def runScreenTest():
                        session.open(screen)
        
        runNextScreen(session, screensToRun)
-
+       
        CONNECT(keyPressedSignal(), session.keyEvent)
        
+       vol = VolumeControl(session)
+       
        runReactor()
        
        configfile.save()