X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e330dbae62e83dd2aa2ff63a984519a84b23c3ad..45164193c322c84366fbde35db544cf005bf20dc:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 6c15c707..604f164a 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -6,7 +6,8 @@ from Components.config import configfile, configsequencearg
 from Components.config import config, configElement, ConfigSubsection, configSequence
 from ChannelSelection import ChannelSelection
 
-from Components.BlinkingPoint import BlinkingPoint
+from Components.Pixmap import PixmapConditional
+from Components.BlinkingPixmap import BlinkingPixmapConditional
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 
@@ -393,14 +394,14 @@ class InfoBarInstantRecord:
 			})
 		self.recording = None
 		
-		self["BlinkingPoint"] = BlinkingPoint()
-		self.onShown.append(self["BlinkingPoint"].hidePoint)
-
+		self["BlinkingPoint"] = BlinkingPixmapConditional()
+		self.onShown.append(self["BlinkingPoint"].hidePixmap)
+		self["BlinkingPoint"].setConnect(self.session.nav.RecordTimer.isRecording)
+		
 	def stopCurrentRecording(self):	
 		self.session.nav.RecordTimer.removeEntry(self.recording)
 		self.recording = None
-		self["BlinkingPoint"].stopBlinking()
-	
+			
 	def startInstantRecording(self):
 		serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
 			
@@ -418,13 +419,19 @@ class InfoBarInstantRecord:
 		self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")
 		self.recording.dontSave = True
 		
-		self["BlinkingPoint"].startBlinking()
+		#self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())
+		
+	def isInstantRecordRunning(self):
+		if self.recording != None:
+			if self.recording.isRunning():
+				return True
+		return False
 
 	def recordQuestionCallback(self, answer):
 		if answer == False:
 			return
 		
-		if self.recording != None:
+		if self.isInstantRecordRunning():
 			self.stopCurrentRecording()
 		else:
 			self.startInstantRecording()
@@ -436,7 +443,7 @@ class InfoBarInstantRecord:
 			self.session.open(MessageBox, "No HDD found!")
 			return
 	
-		if self.recording != None:
+		if self.isInstantRecordRunning():
 			self.session.openWithCallback(self.recordQuestionCallback, MessageBox, _("Do you want to stop the current\n(instant) recording?"))
 		else:
 			self.session.openWithCallback(self.recordQuestionCallback, MessageBox, _("Start recording?"))
@@ -456,3 +463,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