use Source/Render/Converter stuff for:

- forground tuner displaying
- tuners in use displaying
- running record pixmap

2 files changed, 34 insertions, 11 deletions

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index dbfe20cc..06892a78 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1315,9 +1315,10 @@ class InfoBarInstantRecord:
 				"instantRecord": (self.instantRecord, _("Instant Record...")),
 			})
 		self.recording = []
+#### DEPRECATED CODE ####
 		self["BlinkingPoint"] = BlinkingPixmapConditional()
-		self["BlinkingPoint"].hide()
 		self["BlinkingPoint"].setConnect(self.session.nav.RecordTimer.isRecording)
+#########################
 
 	def stopCurrentRecording(self, entry = -1):
 		if entry is not None and entry != -1:
@@ -1363,7 +1364,9 @@ class InfoBarInstantRecord:
 		recording.dontSave = True
 		self.recording.append(recording)
 
-		#self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())
+#### DEPRECATED CODE ####
+		self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())
+#########################
 
 	def isInstantRecordRunning(self):
 		print "self.recording:", self.recording
@@ -1653,20 +1656,23 @@ class InfoBarSubserviceSelection:
 
 class InfoBarAdditionalInfo:
 	def __init__(self):
-		self["NimA"] = Pixmap()
-		self["NimB"] = Pixmap()
-		self["NimA_Active"] = Pixmap()
-		self["NimB_Active"] = Pixmap()
 
 		self["RecordingPossible"] = Boolean(fixed=harddiskmanager.HDDCount() > 0)
 		self["TimeshiftPossible"] = self["RecordingPossible"]
 		self["ExtensionsAvailable"] = Boolean(fixed=1)
 
-		self.session.nav.event.append(self.gotServiceEvent) # we like to get service events
+######### DEPRECATED CODE ##########
+		self["NimA"] = Pixmap()
+		self["NimB"] = Pixmap()
+		self["NimA_Active"] = Pixmap()
+		self["NimB_Active"] = Pixmap()
+
 		res_mgr = eDVBResourceManager.getInstance()
 		if res_mgr:
 			res_mgr.frontendUseMaskChanged.get().append(self.tunerUseMaskChanged)
 
+		self.session.nav.event.append(self.gotServiceEvent) # we like to get service events
+
 	def tunerUseMaskChanged(self, mask):
 		if mask&1:
 			self["NimA_Active"].show()
@@ -1694,6 +1700,7 @@ class InfoBarAdditionalInfo:
 		service = self.session.nav.getCurrentService()
 		if ev == iPlayableService.evUpdatedInfo or ev == iPlayableService.evEnd:
 			self.checkTunerState(service)
+####################################
 
 class InfoBarNotifications:
 	def __init__(self):
diff --git a/lib/python/Screens/SessionGlobals.py b/lib/python/Screens/SessionGlobals.py
index d90c2080..df884ba9 100644
--- a/lib/python/Screens/SessionGlobals.py
+++ b/lib/python/Screens/SessionGlobals.py
@@ -1,14 +1,30 @@
+from enigma import iPlayableService
 from Screens.Screen import Screen
 from Components.Sources.CurrentService import CurrentService
 from Components.Sources.EventInfo import EventInfo
 from Components.Sources.FrontendStatus import FrontendStatus
+from Components.Sources.FrontendInfo import FrontendInfo
 from Components.Sources.Source import Source
+from Components.Sources.Misc import Misc
 
 class SessionGlobals(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
-		self["CurrentService"] = CurrentService(self.session.nav)
-		self["Event_Now"] = EventInfo(self.session.nav, EventInfo.NOW)
-		self["Event_Next"] = EventInfo(self.session.nav, EventInfo.NEXT)
-		self["FrontendStatus"] = FrontendStatus(service_source = self.session.nav.getCurrentService)
+		self["CurrentService"] = CurrentService(session.nav)
+		self["Event_Now"] = EventInfo(session.nav, EventInfo.NOW)
+		self["Event_Next"] = EventInfo(session.nav, EventInfo.NEXT)
+		self["FrontendStatus"] = FrontendStatus(service_source = session.nav.getCurrentService)
+		self["FrontendInfo"] = FrontendInfo(service_source = session.nav.getCurrentService)
 		self["VideoPicture"] = Source()
+		self["GlobalInfo"] = Misc(session)
+		session.nav.event.append(self.serviceEvent)
+		self.service_state = 0
+
+	def serviceEvent(self, evt):
+		if evt == iPlayableService.evStart:
+			self.service_state = 1
+		elif evt == iPlayableService.evEnd:
+			self.service_state = 0
+		elif evt == iPlayableService.evUpdatedInfo and self.service_state == 1:
+			self.service_state = 2
+			self["FrontendInfo"].updateFrontendData()