git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
save and restore volume
[enigma2.git]
/
lib
/
python
/
Screens
/
InfoBarGenerics.py
diff --git
a/lib/python/Screens/InfoBarGenerics.py
b/lib/python/Screens/InfoBarGenerics.py
index 22cba7a21f5d94963e60f868ec3d0c8dd4ddc40b..c75b1511e945a824f38179a8843abd16e2c08401 100644
(file)
--- 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.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
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"""
class InfoBarVolumeControl:
"""Volume control, handles volUp, volDown, volMute actions and display
a corresponding dialog"""
-
def __init__(self):
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,
self["VolumeActions"] = ActionMap( ["InfobarVolumeActions"] ,
{
"volumeUp": self.volUp,
@@
-40,17
+43,27
@@
class InfoBarVolumeControl:
self.hideVolTimer = eTimer()
self.hideVolTimer.timeout.get().append(self.volHide)
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())
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.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):
self.hideVolTimer.start(3000)
def volHide(self):
@@
-185,17
+198,8
@@
class InfoBarPowerKey:
self.session.open(Standby, self)
def quit(self):
self.session.open(Standby, self)
def quit(self):
- # self.session.open(Standby, self)
- ref = self.session.nav.getCurrentlyPlayingServiceReference()
- if ref is not None:
- refstr = ref.toString()
- else:
- refstr = ""
-
- #configfile.save()
quitMainloop(0)
quitMainloop(0)
-
class InfoBarNumberZap:
""" Handles an initial number for NumberZapping """
def __init__(self):
class InfoBarNumberZap:
""" Handles an initial number for NumberZapping """
def __init__(self):