X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8bbff13e7842b0abd07cf2262bf2a87027cc7030..4aa7b11f525aaa22b3ad6b0d247ea67f39b498de:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 9d610dc8..77c4a415 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -39,7 +39,7 @@ class InfoBarVolumeControl:
 	a corresponding dialog"""
 	def __init__(self):
 		config.audio = ConfigSubsection()
-		config.audio.volume = configElement("config.audio.volume", configSequence, [5], configsequencearg.get("INTEGER", (0, 100)))
+		config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100)))
 
 		self["VolumeActions"] = ActionMap( ["InfobarVolumeActions"] ,
 			{
@@ -69,7 +69,7 @@ class InfoBarVolumeControl:
 		self.volumeDialog.instance.show()
 		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
 		self.volSave()
-		self.hideVolTimer.start(3000)
+		self.hideVolTimer.start(3000, True)
 
 	def	volDown(self):
 		if (eDVBVolumecontrol.getInstance().isMuted()):
@@ -78,7 +78,7 @@ class InfoBarVolumeControl:
 		self.volumeDialog.instance.show()
 		self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
 		self.volSave()
-		self.hideVolTimer.start(3000)
+		self.hideVolTimer.start(3000, True)
 		
 	def volHide(self):
 		self.volumeDialog.instance.hide()
@@ -119,7 +119,7 @@ class InfoBarShowHide:
 		
 		self.hideTimer = eTimer()
 		self.hideTimer.timeout.get().append(self.doTimerHide)
-		self.hideTimer.start(5000)
+		self.hideTimer.start(5000, True)
 
 	def delHideTimer(self):
 		del self.hideTimer
@@ -129,8 +129,7 @@ class InfoBarShowHide:
 		
 	def show(self):
 		self.state = self.STATE_SHOWN
-		self.hideTimer.stop()
-		self.hideTimer.start(5000)
+		self.hideTimer.start(5000, True)
 
 	def doTimerHide(self):
 		self.hideTimer.stop()
@@ -167,7 +166,7 @@ class NumberZap(Screen):
 		self.close(int(self["number"].getText()))
 
 	def keyNumberGlobal(self, number):
-		self.Timer.start(3000)		#reset timer
+		self.Timer.start(3000, True)		#reset timer
 		self.field = self.field + str(number)
 		self["number"].setText(self.field)
 		if len(self.field) >= 4:
@@ -199,7 +198,7 @@ class NumberZap(Screen):
 
 		self.Timer = eTimer()
 		self.Timer.timeout.get().append(self.keyOK)
-		self.Timer.start(3000)
+		self.Timer.start(3000, True)
 
 class InfoBarPowerKey:
 	""" PowerKey stuff - handles the powerkey press and powerkey release actions"""
@@ -221,7 +220,7 @@ class InfoBarPowerKey:
 	
 	def powerdown(self):
 		self.standbyblocked = 0
-		self.powerKeyTimer.start(3000)
+		self.powerKeyTimer.start(3000, True)
 
 	def powerup(self):
 		self.powerKeyTimer.stop()
@@ -400,7 +399,7 @@ class InfoBarTuner:
 		self["ber_progress"] = ProgressBar()
 		self.timer = eTimer()
 		self.timer.timeout.get().append(self.updateTunerInfo)
-		self.timer.start(500)
+		self.timer.start(1000)
 
 	def calc(self,val):
 		if not val:
@@ -478,6 +477,10 @@ class InfoBarPVR:
 		self.seekTimer = eTimer()
 		self.seekTimer.timeout.get().append(self.seekTimerFired)
 		self.skipinterval = 500 # 500ms skip interval
+		self.onClose.append(self.delSeekTimer)
+	
+	def delSeekTimer(self):
+		del self.seekTimer
 	
 	def seekTimerFired(self):
 		if self.skipmode > 0:
@@ -559,6 +562,8 @@ class InfoBarPVR:
 			}
 		self.setSeekState(lookup[self.seekstate]);
 
+from RecordTimer import parseEvent
+
 class InfoBarInstantRecord:
 	"""Instant Record - handles the instantRecord action in order to 
 	start/stop instant records"""
@@ -579,19 +584,25 @@ class InfoBarInstantRecord:
 			
 	def startInstantRecording(self):
 		serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
-			
+		
 		# try to get event info
-		epg = None
+		event = None
 		try:
 			service = self.session.nav.getCurrentService()
 			info = service.info()
 			ev = info.getEvent(0)
-			epg = ev
+			event = ev
 		except:
 			pass
 		
+		if event is not None:
+			data = parseEvent(event)
+			data = (data[0], data[1] + 3600 * 10, data[2], data[3], data[4])
+		else:
+			data = (time.time(), time.time() + 3600 * 10, "instant record", "", None)
+		
 		# fix me, description. 
-		self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")
+		self.recording = self.session.nav.recordWithTimer(serviceref, *data)
 		self.recording.dontSave = True
 		
 		#self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())