the record.png blinks now whenever a timerentry in the recordingtimer is running

[enigma2.git] / lib / python / Screens / InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 4f75472871afcd2e32e2c675172939df78df58a0..604f164a42c43cafa4c20da5887019c2a3ba142e 100644 (file)
--- 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.config import config, configElement, ConfigSubsection, configSequence
 from ChannelSelection import ChannelSelection
 

-from Components.BlinkingPoint import BlinkingPointConditional
+from Components.Pixmap import PixmapConditional
+from Components.BlinkingPixmap import BlinkingPixmapConditional

 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 
 from Components.ServiceName import ServiceName
 from Components.EventInfo import EventInfo
 


@@ -393,14 +394,14 @@ class InfoBarInstantRecord:
                        })
                self.recording = None
                
                        })
                self.recording = None
                

-               self["BlinkingPoint"] = BlinkingPointConditional("/usr/share/enigma2/record.png")
-               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
        def stopCurrentRecording(self): 
                self.session.nav.RecordTimer.removeEntry(self.recording)
                self.recording = None

-               #self["BlinkingPoint"].stopBlinking()
-       
+                       

        def startInstantRecording(self):
                serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
                        
        def startInstantRecording(self):
                serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
                        


@@ -418,14 +419,19 @@ class InfoBarInstantRecord:
                self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")
                self.recording.dontSave = True
                
                self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")
                self.recording.dontSave = True
                

-               self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())
-               #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
                
 
        def recordQuestionCallback(self, answer):
                if answer == False:
                        return
                

-               if self.recording != None:
+               if self.isInstantRecordRunning():

                        self.stopCurrentRecording()
                else:
                        self.startInstantRecording()
                        self.stopCurrentRecording()
                else:
                        self.startInstantRecording()


@@ -437,7 +443,7 @@ class InfoBarInstantRecord:
                        self.session.open(MessageBox, "No HDD found!")
                        return
        
                        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?"))
                        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?"))


@@ -457,3 +463,17 @@ class InfoBarAudioSelection:
                n = audio.getNumberOfTracks()
                if n > 0:
                        self.session.open(AudioSelection, audio)
                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