Don't set fastblank to high if the currently selected port (vs. the to-be-selected...

[enigma2.git] / lib / python / Plugins / SystemPlugins / Videomode / VideoHardware.py

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index 893fa5f69da5c5ad7055844613de14d4fc61d28a..c90f8fd8980a192b28cc25daf8eff4e621a9ffbf 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -59,6 +59,8 @@ class VideoHardware:
                self.last_modes_preferred =  [ ]
                self.on_hotplug = CList()
                self.standby = False
+               self.current_mode = None
+               self.current_port = None
 
                self.readAvailableModes()
 
@@ -85,6 +87,7 @@ class VideoHardware:
 #              self.timer.callback.append(self.readPreferredModes)
 #              self.timer.start(1000)
 
+               config.av.colorformat.addNotifier(self.updateFastblank) 
 
        def AVSwitchSetInput(self, mode):
                self.standby = mode == "SCART"
@@ -132,6 +135,7 @@ class VideoHardware:
                print "setMode - port:", port, "mode:", mode, "rate:", rate
                # we can ignore "port"
                self.current_mode = mode
+               self.current_port = port
                modes = self.rates[mode][rate]
 
                mode_50 = modes.get(50)
@@ -276,25 +280,41 @@ class VideoHardware:
                open("/proc/stb/video/policy", "w").write(policy)
                open("/proc/stb/denc/0/wss", "w").write(wss)
                self.updateSlowblank()
+               self.updateFastblank()
 
        def updateSlowblank(self):
                if self.standby:
                        from Components.SystemInfo import SystemInfo
                        if SystemInfo["ScartSwitch"]:
-                               mode = "scart"
+                               input = "scart"
                                sb = "vcr"
                        else:
-                               mode = "off"
+                               input = "off"
                                sb = "0"
                else:
-                       mode = "encoder"
+                       input = "encoder"
                        sb = "auto"
 
                open("/proc/stb/avs/0/sb", "w").write(sb)
-               open("/proc/stb/avs/0/input", "w").write(mode)
+               open("/proc/stb/avs/0/input", "w").write(input)
 
        def updateStandby(self):
                self.updateSlowblank()
+               self.updateFastblank()
+
+       def updateFastblank(self, *args):
+               if self.standby:
+                       from Components.SystemInfo import SystemInfo
+                       if SystemInfo["ScartSwitch"]:
+                               fb = "vcr"
+                       else:
+                               fb = "low"
+               else:
+                       if self.current_port == "Scart" and config.av.colorformat.value == "rgb":
+                               fb = "high"
+                       else:
+                               fb = "low"
+               open("/proc/stb/avs/0/fb", "w").write(fb)
 
 config.av.edid_override = ConfigYesNo(default = False)
 video_hw = VideoHardware()