add mute

[enigma2.git] / lib / python / Screens / InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index ef44ef3e5c5d3aaa499f9e310a825fccefd13620..2dc7fceef69500e844e062380411e3e82be47307 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -38,7 +38,9 @@ class InfoBar(Screen):
                self.hideTimer = eTimer()
                self.hideTimer.timeout.get().append(self.doTimerHide)
                #self.hideTimer.start(1000)
                self.hideTimer = eTimer()
                self.hideTimer.timeout.get().append(self.doTimerHide)
                #self.hideTimer.start(1000)

-
+               
+               self.hideVolTimer = eTimer()
+               self.hideVolTimer.timeout.get().append(self.volHide)

 
                self["actions"] = ActionMap( [ "InfobarActions" ], 
                        {
 
                self["actions"] = ActionMap( [ "InfobarActions" ], 
                        {


@@ -121,16 +123,12 @@ class InfoBar(Screen):
                eDVBVolumecontrol.getInstance().volumeUp()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                eDVBVolumecontrol.getInstance().volumeUp()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())

-               self.hideVolTimer = eTimer()
-               self.hideVolTimer.timeout.get().append(self.volHide)

                self.hideVolTimer.start(3000)
 
        def     volDown(self):
                eDVBVolumecontrol.getInstance().volumeDown()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
                self.hideVolTimer.start(3000)
 
        def     volDown(self):
                eDVBVolumecontrol.getInstance().volumeDown()
                self.volumeDialog.instance.show()
                self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())

-               self.hideVolTimer = eTimer()
-               self.hideVolTimer.timeout.get().append(self.volHide)

                self.hideVolTimer.start(3000)
                
        def volHide(self):
                self.hideVolTimer.start(3000)
                
        def volHide(self):


@@ -146,7 +144,10 @@ class InfoBar(Screen):
 
        def     volMute(self):
                eDVBVolumecontrol.getInstance().volumeToggleMute()
 
        def     volMute(self):
                eDVBVolumecontrol.getInstance().volumeToggleMute()

-               self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               #self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               self.volumeDialog.instance.show()
+               self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+               self.hideVolTimer.start(3000)

 
        def     quit(self):
                configfile.save()
 
        def     quit(self):
                configfile.save()