X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ed40f6f85c9c07c3c1224ae20601082c0309a631..54042f13aaa98b655f0dfa907ef326430ec65d39:/lib/python/Components/AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index a8e471ba..c712a60e 100644
--- 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) }
@@ -42,19 +42,24 @@ class AVSwitch:
 			val = 4
 		elif valstr == "16_10_panscan":
 			val = 5
+		elif valstr == "16_9_letterbox":
+			val = 6
 		return val
 
 	def setAspectWSS(self, aspect=None):
 		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)
 			else:
 				value = 1 # auto
-		elif aspect == 3: # always 16:9
+		elif aspect == 3 or aspect == 6: # always 16:9
 			value = 4 # 16:9_full_format
 		elif aspect == 4 or aspect == 5: # 16:10
 			value = 10 # 14:9_full_format
@@ -67,7 +72,7 @@ class AVSwitch:
 			value = 2 # 12 V
 		elif aspect == 2: # 16:9
 			value = 4 # auto
-		elif aspect == 3 or aspect == 4 or aspect == 5: # always 16:9
+		elif aspect == 3 or aspect == 4 or aspect == 5 or aspect == 6: # always 16:9
 			value = 1 # 6V
 		eAVSwitch.getInstance().setSlowblank(value)
 
@@ -87,7 +92,8 @@ def InitAVSwitch():
 			"16_9": _("16:9"), 
 			"16_9_always": _("16:9 always"),
 			"16_10_letterbox": _("16:10 Letterbox"),
-			"16_10_panscan": _("16:10 PanScan")}, 
+			"16_10_panscan": _("16:10 PanScan"), 
+			"16_9_letterbox": _("16:9 Letterbox")}, 
 			default = "4_3_letterbox")
 	config.av.tvsystem = ConfigSelection(choices = {"pal": _("PAL"), "ntsc": _("NTSC"), "multinorm": _("multinorm")}, default="pal")
 	config.av.wss = ConfigEnableDisable(default = True)
@@ -101,7 +107,7 @@ def InitAVSwitch():
 		iAVSwitch.setColorFormat(map[configElement.value])
 
 	def setAspectRatio(configElement):
-		map = {"4_3_letterbox": 0, "4_3_panscan": 1, "16_9": 2, "16_9_always": 3, "16_10_letterbox": 4, "16_10_panscan": 5}
+		map = {"4_3_letterbox": 0, "4_3_panscan": 1, "16_9": 2, "16_9_always": 3, "16_10_letterbox": 4, "16_10_panscan": 5, "16_9_letterbox" : 6}
 		iAVSwitch.setAspectRatio(map[configElement.value])
 
 	def setSystem(configElement):
@@ -118,3 +124,5 @@ def InitAVSwitch():
 	config.av.wss.addNotifier(setWSS)
 
 	iAVSwitch.setInput("ENCODER") # init on startup
+	SystemInfo["ScartSwitch"] = eAVSwitch.getInstance().haveScartSwitch()
+