show dolby, crypt and format status in the infobar - we don't have functionality to get the info about this yet

2 files changed, 22 insertions, 6 deletions

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index b0dfc0ab..62e4fcd2 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -10,7 +10,7 @@ from Components.ServicePosition import ServicePosition
 from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
 	InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
 	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
-	InfoBarAudioSelection
+	InfoBarAudioSelection, InfoBarAdditionalInfo
 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 
@@ -18,10 +18,10 @@ from enigma import *
 
 import time
 
-class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
-	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection,
-	HelpableScreen):
+class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
+	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
+	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
+	HelpableScreen, InfoBarAdditionalInfo):
 
 	def __init__(self, session):
 		Screen.__init__(self, session)
@@ -34,7 +34,8 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
 		for x in HelpableScreen, \
 				InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
 				InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-				InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection:
+				InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
+				InfoBarAdditionalInfo:
 			x.__init__(self)
 
 		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index ce2c0da5..8ab16c53 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -6,6 +6,7 @@ from Components.config import configfile, configsequencearg
 from Components.config import config, configElement, ConfigSubsection, configSequence
 from ChannelSelection import ChannelSelection
 
+from Components.Pixmap import PixmapConditional
 from Components.BlinkingPixmap import BlinkingPixmapConditional
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
@@ -461,3 +462,17 @@ class InfoBarAudioSelection:
 		n = audio.getNumberOfTracks()
 		if n > 0:
 			self.session.open(AudioSelection, audio)
+
+class InfoBarAdditionalInfo:
+	def __init__(self):
+		self["DolbyActive"] = PixmapConditional()
+		# TODO: get the info from c++ somehow
+		self["DolbyActive"].setConnect(lambda: False)
+		
+		self["CryptActive"] = PixmapConditional()
+		# TODO: get the info from c++ somehow
+		self["CryptActive"].setConnect(lambda: False)
+		
+		self["FormatActive"] = PixmapConditional()
+		# TODO: get the info from c++ somehow
+		self["FormatActive"].setConnect(lambda: False)
\ No newline at end of file