aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorRonny Strutz <ronny.strutz@multimedia-labs.de>2005-11-15 16:44:59 +0000
committerRonny Strutz <ronny.strutz@multimedia-labs.de>2005-11-15 16:44:59 +0000
commitf935094d63a0b6cf1632962ea67d0a19e98a9df8 (patch)
tree62e8799a3ae206362c33e79d708560718beba7be /lib/python
parente7af864f5043934dfd02d8c00deb894cfeea9e68 (diff)
downloadenigma2-f935094d63a0b6cf1632962ea67d0a19e98a9df8.tar.gz
enigma2-f935094d63a0b6cf1632962ea67d0a19e98a9df8.zip
save and restore volume
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/InfoBarGenerics.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index b218950d..c75b1511 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -2,7 +2,8 @@ from Screen import Screen
from Components.ActionMap import ActionMap
from Components.ActionMap import NumberActionMap
from Components.Label import Label
-from Components.config import configfile
+from Components.config import configfile, configsequencearg
+from Components.config import config, configElement, ConfigSubsection, configSequence
from ChannelSelection import ChannelSelection
from Components.ServiceName import ServiceName
@@ -26,8 +27,10 @@ from Menu import MainMenu, mdom
class InfoBarVolumeControl:
"""Volume control, handles volUp, volDown, volMute actions and display
a corresponding dialog"""
-
def __init__(self):
+ config.audio = ConfigSubsection()
+ config.audio.volume = configElement("config.audio.volume", configSequence, [5], configsequencearg.get("INTEGER", (0, 100)))
+
self["VolumeActions"] = ActionMap( ["InfobarVolumeActions"] ,
{
"volumeUp": self.volUp,
@@ -40,17 +43,27 @@ class InfoBarVolumeControl:
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):
eDVBVolumecontrol.getInstance().volumeUp()
self.volumeDialog.instance.show()
self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+ self.volSave()
self.hideVolTimer.start(3000)
def volDown(self):
eDVBVolumecontrol.getInstance().volumeDown()
self.volumeDialog.instance.show()
self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
+ self.volSave()
self.hideVolTimer.start(3000)
def volHide(self):