X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6eeefece35e4269e02fdb7abab4f79d8e7b8f98b..d0a84d65c3a38c3e85576159c39ac88a46bb7b4a:/lib/python/Components/AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 33045d40..d3224fd7 100644
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,6 +1,5 @@
 from config import config, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
-import os
-from enigma import *
+from enigma import eAVSwitch
 
 class AVSwitch:
 	INPUT = { "ENCODER": (0, 4), "SCART": (1, 3), "AUX": (2, 4) }
@@ -42,6 +41,8 @@ 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):
@@ -54,7 +55,7 @@ class AVSwitch:
 				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 +68,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,9 +88,10 @@ 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")}, default="pal")
+	config.av.tvsystem = ConfigSelection(choices = {"pal": _("PAL"), "ntsc": _("NTSC"), "multinorm": _("multinorm")}, default="pal")
 	config.av.wss = ConfigEnableDisable(default = True)
 	config.av.defaultac3 = ConfigYesNo(default = False)
 	config.av.vcrswitch = ConfigEnableDisable(default = False)
@@ -101,11 +103,11 @@ 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):
-		map = {"pal": 0, "ntsc": 1}
+		map = {"pal": 0, "ntsc": 1, "multinorm" : 2}
 		iAVSwitch.setSystem(map[configElement.value])
 
 	def setWSS(configElement):