fixes bug #435

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

diff --git a/lib/python/Screens/SessionGlobals.py b/lib/python/Screens/SessionGlobals.py
index df884ba970c5b5fc05c4c491b7d5f0afb479ceef..6a9379bc63c70bd04ef016e026f7c9c8e8c9c19f 100644 (file)
--- a/lib/python/Screens/SessionGlobals.py
+++ b/lib/python/Screens/SessionGlobals.py
@@ -1,11 +1,14 @@
-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 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
+from Components.Sources.TunerInfo import TunerInfo
+from Components.Sources.Boolean import Boolean
+from Components.Sources.RecordState import RecordState
+from Components.Converter.Combine import Combine
+from Components.Renderer.FrontpanelLed import FrontpanelLed

 
 class SessionGlobals(Screen):
        def __init__(self, session):
 
 class SessionGlobals(Screen):
        def __init__(self, session):


@@ -14,17 +17,33 @@ class SessionGlobals(Screen):
                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["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["FrontendInfo"] = FrontendInfo(navcore = session.nav)

                self["VideoPicture"] = Source()
                self["VideoPicture"] = Source()

-               self["GlobalInfo"] = Misc(session)
-               session.nav.event.append(self.serviceEvent)
-               self.service_state = 0
+               self["TunerInfo"] = TunerInfo()
+               self["RecordState"] = RecordState(session)
+               self["Standby"] = Boolean(fixed = False)
+               
+               from Components.SystemInfo import SystemInfo
+               
+               combine = Combine(func = lambda s: {(False, False): 0, (False, True): 1, (True, False): 2, (True, True): 3}[(s[0].boolean, s[1].boolean)])
+               combine.connect(self["Standby"])
+               combine.connect(self["RecordState"])

 
 

-       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()
+               #                      |  two leds  | single led |
+               # recordstate  standby   red green   
+               #    false      false    off   on     off
+               #    true       false    blnk  on     blnk
+               #    false      true      on   off    off
+               #    true       true     blnk  off    blnk
+               
+               PATTERN_ON     = (20, 0xffffffff, 0xffffffff)
+               PATTERN_OFF    = (20, 0, 0)
+               PATTERN_BLINK  = (20, 0x55555555, 0xa7fccf7a)
+
+               nr_leds = SystemInfo.get("NumFrontpanelLEDs", 0)
+
+               if nr_leds == 1:
+                       FrontpanelLed(which = 0, boolean = False, patterns = [PATTERN_OFF, PATTERN_BLINK, PATTERN_OFF, PATTERN_BLINK]).connect(combine)
+               elif nr_leds == 2:
+                       FrontpanelLed(which = 0, boolean = False, patterns = [PATTERN_OFF, PATTERN_BLINK, PATTERN_ON, PATTERN_BLINK]).connect(combine)
+                       FrontpanelLed(which = 1, boolean = False, patterns = [PATTERN_ON, PATTERN_ON, PATTERN_OFF, PATTERN_OFF]).connect(combine)