cut away 1/4th of enigma loading time by loading languages when they are used

[enigma2.git] / lib / python / Components / AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 67fad7bc62d3fe4d498cae7e915ae735a7ce2763..c712a60e80cf09242c507eb1d46724b9e87f47b6 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,6 +1,6 @@
 from config import config, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
-import os
 from enigma import eAVSwitch
+from SystemInfo import SystemInfo
 
 class AVSwitch:
        INPUT = { "ENCODER": (0, 4), "SCART": (1, 3), "AUX": (2, 4) }
@@ -50,7 +50,10 @@ class AVSwitch:
                if aspect is None:
                        aspect = self.getAspectRatioSetting()
                if aspect == 0 or aspect == 1: # letterbox or panscan
-                       value = 3 # 4:3_full_format
+                       if not config.av.wss.value:
+                               value = 0 # wss off
+                       else:
+                               value = 3 # 4:3_full_format
                elif aspect == 2: # 16:9
                        if not config.av.wss.value:
                                value = 2 # auto(4:3_off)
@@ -121,3 +124,5 @@ def InitAVSwitch():
        config.av.wss.addNotifier(setWSS)
 
        iAVSwitch.setInput("ENCODER") # init on startup
+       SystemInfo["ScartSwitch"] = eAVSwitch.getInstance().haveScartSwitch()
+