X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/364dcf5cdfa9f39414074a48501f25d714117729..f935094d63a0b6cf1632962ea67d0a19e98a9df8:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 5e28cdee..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
@@ -18,14 +19,18 @@ from Screens.Standby import Standby
 #from enigma import eTimer, eDVBVolumecontrol, quitMainloop
 from enigma import *
 
+import time
+
 # hack alert!
 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,
@@ -38,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):
@@ -183,11 +198,8 @@ class InfoBarPowerKey:
 			self.session.open(Standby, self)
 
 	def quit(self):
-		#	self.session.open(Standby, self)
-		configfile.save()
 		quitMainloop(0)
 
-
 class InfoBarNumberZap:
 	""" Handles an initial number for NumberZapping """
 	def __init__(self):
@@ -315,10 +327,10 @@ class InfoBarPVR:
 		seekable.seekRelative(dir, 90 * seektime)
 
 	def seekFwd(self):
-		self.doSeek(+1, 10000)
+		self.doSeek(+1, 60000)
 	
 	def seekBack(self):
-		self.doSeek(-1, 10000)
+		self.doSeek(-1, 60000)
 
 class InfoBarInstantRecord:
 	"""Instant Record - handles the instantRecord action in order to