X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d8733ed57694bbb5309afc396cabe2bfc6f35c16..aa6c9dd559999a0b0223fbd66cd0f0512ebc0345:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index f8b185f0..1b743194 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -16,6 +16,7 @@ from Components.ServiceName import ServiceName
 from Components.config import config, configElement, ConfigSubsection, configSequence, configElementBoolean
 from Components.config import configfile, configsequencearg
 from Components.TimerList import TimerEntryComponent
+from Components.TunerInfo import TunerInfo
 
 from EpgSelection import EPGSelection
 from Plugins.Plugin import PluginDescriptor
@@ -28,6 +29,7 @@ from Screens.InputBox import InputBox
 from Screens.MessageBox import MessageBox
 from Screens.MinuteInput import MinuteInput
 from Screens.TimerSelection import TimerSelection
+from Screens.PictureInPicture import PictureInPicture
 from ServiceReference import ServiceReference
 
 from Tools import Notifications
@@ -429,49 +431,30 @@ class InfoBarEPG:
 			self.epglist[1]=tmp
 			setEvent(self.epglist[0])
 
-from math import log
-
 class InfoBarTuner:
 	"""provides a snr/agc/ber display"""
 	def __init__(self):
 		self["snr"] = Label()
 		self["agc"] = Label()
 		self["ber"] = Label()
-		self["snr_percent"] = Label()
-		self["agc_percent"] = Label()
-		self["ber_count"] = Label()
-		self["snr_progress"] = ProgressBar()
-		self["agc_progress"] = ProgressBar()
-		self["ber_progress"] = ProgressBar()
+		self["snr_percent"] = TunerInfo(TunerInfo.SNR_PERCENTAGE, servicefkt = self.session.nav.getCurrentService)
+		self["agc_percent"] = TunerInfo(TunerInfo.AGC_PERCENTAGE, servicefkt = self.session.nav.getCurrentService)
+		self["ber_count"] = TunerInfo(TunerInfo.BER_VALUE, servicefkt = self.session.nav.getCurrentService)
+		self["snr_progress"] = TunerInfo(TunerInfo.SNR_BAR, servicefkt = self.session.nav.getCurrentService)
+		self["agc_progress"] = TunerInfo(TunerInfo.AGC_BAR, servicefkt = self.session.nav.getCurrentService)
+		self["ber_progress"] = TunerInfo(TunerInfo.BER_BAR, servicefkt = self.session.nav.getCurrentService)
 		self.timer = eTimer()
 		self.timer.timeout.get().append(self.updateTunerInfo)
 		self.timer.start(1000)
 
-	def calc(self,val):
-		if not val:
-			return 0
-		if val < 2500:
-			return (long)(log(val)/log(2))
-		return val*100/65535
-
 	def updateTunerInfo(self):
 		if self.instance.isVisible():
-			service = self.session.nav.getCurrentService()
-			snr=0
-			agc=0
-			ber=0
-			if service is not None:
-				feinfo = service.frontendStatusInfo()
-				if feinfo is not None:
-					ber=feinfo.getFrontendInfo(iFrontendStatusInformation.bitErrorRate)
-					snr=feinfo.getFrontendInfo(iFrontendStatusInformation.signalPower)*100/65536
-					agc=feinfo.getFrontendInfo(iFrontendStatusInformation.signalQuality)*100/65536
-			self["snr_percent"].setText("%d%%"%(snr))
-			self["agc_percent"].setText("%d%%"%(agc))
-			self["ber_count"].setText("%d"%(ber))
-			self["snr_progress"].setValue(snr)
-			self["agc_progress"].setValue(agc)
-			self["ber_progress"].setValue(self.calc(ber))
+			self["snr_percent"].update()
+			self["agc_percent"].update()
+			self["ber_count"].update()
+			self["snr_progress"].update()
+			self["agc_progress"].update()
+			self["ber_progress"].update()
 
 class InfoBarEvent:
 	"""provides a current/next event info display"""
@@ -975,6 +958,45 @@ class InfoBarTimeshift:
 		self.timeshift_enabled = False
 		self.__seekableStatusChanged()
 
+class InfoBarExtensions:
+	def __init__(self):
+		self.pipshown = False
+		
+		self["InstantExtensionsActions"] = HelpableActionMap(self, "InfobarExtensions",
+			{
+				"extensions": (self.extensions, "Extensions..."),
+			})
+			
+	def extensions(self):
+		list = []
+		if self.pipshown == False:
+			list.append((_("Activate Picture in Picture"), "pipon"))
+		elif self.pipshown == True:
+			list.append((_("Disable Picture in Picture"), "pipoff"))
+		self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list)
+
+	def extensionCallback(self, answer):
+		if answer is not None:
+			if answer[1] == "pipon":
+				self.session.nav.stopService()
+				self.pip = self.session.instantiateDialog(PictureInPicture)
+				#self.pip.show()
+				
+				newservice = self.session.nav.getCurrentlyPlayingServiceReference()
+				self.pipservice = eServiceCenter.getInstance().play(newservice)
+				if self.pipservice and not self.pipservice.setTarget(1):
+					self.pipservice.start()
+					self.pipshown = True
+				else:
+					self.pipservice = None
+					del self.pip
+	
+			elif answer[1] == "pipoff":
+				#self.pip.hide()
+				self.pipservice = None
+				del self.pip
+				self.pipshown = False
+
 from RecordTimer import parseEvent
 
 class InfoBarInstantRecord:
@@ -1045,11 +1067,16 @@ class InfoBarInstantRecord:
 		return False
 
 	def recordQuestionCallback(self, answer):
+		print "pre:\n", self.recording
+		
 		if answer is None or answer[1] == "no":
 			return
 		list = []
-		for x in self.recording:
-			if x.dontSave:
+		recording = self.recording[:]
+		for x in recording:
+			if not x in self.session.nav.RecordTimer.timer_list:
+				self.recording.remove(x)
+			elif x.dontSave and x.isRunning():
 				list.append(TimerEntryComponent(x, False))		
 
 		if answer[1] == "changeduration":
@@ -1067,8 +1094,11 @@ class InfoBarInstantRecord:
 			if answer[1] == "event":
 				limitEvent = True
 			if answer[1] == "manualduration":
+				self.selectedEntry = len(self.recording)
 				self.session.openWithCallback(self.inputCallback, InputBox, title=_("How many minutes do you want to record?"), text="5", maxSize=False, type=Input.NUMBER)
 			self.startInstantRecording(limitEvent = limitEvent)
+			
+		print "after:\n", self.recording
 
 	def changeDuration(self, entry):
 		if entry is not None: