X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9eb9dd57b133eafdd73eb361220e862f28455ba7..daa673f3b6bc40c4d1251335e233ffb1956f1722:/lib/python/Components/AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 19fccf54..a8e471ba 100644
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,6 +1,6 @@
-from config import *
+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) }
@@ -14,7 +14,8 @@ class AVSwitch:
 		else:
 			eAVSwitch.getInstance().setSlowblank(self.INPUT[input][1])
 		# FIXME why do we have to reset the colorformat? bug in avs-driver?
-		eAVSwitch.getInstance().setColorFormat(config.av.colorformat.value)
+		map = {"cvbs": 0, "rgb": 1, "svideo": 2, "yuv": 3}
+		eAVSwitch.getInstance().setColorFormat(map[config.av.colorformat.value])
 
 	def setColorFormat(self, value):
 		eAVSwitch.getInstance().setColorFormat(value)
@@ -28,7 +29,7 @@ class AVSwitch:
 		eAVSwitch.getInstance().setVideomode(value)
 
 	def getAspectRatioSetting(self):
-		valstr = currentConfigSelectionElement(config.av.aspectratio)
+		valstr = config.av.aspectratio.value
 		if valstr == "4_3_letterbox":
 			val = 0
 		elif valstr == "4_3_panscan":
@@ -49,7 +50,7 @@ class AVSwitch:
 		if aspect == 0 or aspect == 1: # letterbox or panscan
 			value = 3 # 4:3_full_format
 		elif aspect == 2: # 16:9
-			if currentConfigSelectionElement(config.av.wss) == "off":
+			if not config.av.wss.value:
 				value = 2 # auto(4:3_off)
 			else:
 				value = 1 # auto
@@ -71,32 +72,41 @@ class AVSwitch:
 		eAVSwitch.getInstance().setSlowblank(value)
 
 def InitAVSwitch():
-	config.av = ConfigSubsection();
-	config.av.yuvenabled = configElementBoolean("config.av.yuvenabled", 0)
-	colorformat_choices = ( ("cvbs", _("CVBS")), ("rgb", _("RGB")), ("svideo", _("S-Video")), ("yuv", _("YPbPr")) )
+	config.av = ConfigSubsection()
+	config.av.yuvenabled = ConfigBoolean(default=False)
+	colorformat_choices = {"cvbs": _("CVBS"), "rgb": _("RGB"), "svideo": _("S-Video")}
 	
 	# when YUV is not enabled, don't let the user select it
-	if not config.av.yuvenabled.value:
-		colorformat_choices = colorformat_choices[:3]
-
-	config.av.colorformat = configElement("config.av.colorformat", configSelection, 1, colorformat_choices)
-	config.av.aspectratio = configElement("config.av.aspectratio", configSelection, 0, (("4_3_letterbox", _("4:3 Letterbox")), ("4_3_panscan", _("4:3 PanScan")), ("16_9", _("16:9")), ("16_9_always", _("16:9 always")), ("16_10_letterbox", _("16:10 Letterbox")), ("16_10_panscan", _("16:10 PanScan"))) )
-	#config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, ("PAL", "PAL + PAL60", "Multi", "NTSC") )
-	config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, (("pal", _("PAL")), ("ntsc", _("NTSC"))) )
-	config.av.wss = configElement("config.av.wss", configSelection, 0, (("off", _("Off")), ("on", _("On"))) )
-	config.av.defaultac3 = configElement("config.av.defaultac3", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))))
-	config.av.vcrswitch = configElement("config.av.vcrswitch", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))))
+	if config.av.yuvenabled.value:
+		colorformat_choices["yuv"] = _("YPbPr")
+
+	config.av.colorformat = ConfigSelection(choices=colorformat_choices, default="rgb")
+	config.av.aspectratio = ConfigSelection(choices={
+			"4_3_letterbox": _("4:3 Letterbox"),
+			"4_3_panscan": _("4:3 PanScan"), 
+			"16_9": _("16:9"), 
+			"16_9_always": _("16:9 always"),
+			"16_10_letterbox": _("16:10 Letterbox"),
+			"16_10_panscan": _("16:10 PanScan")}, 
+			default = "4_3_letterbox")
+	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)
 
 	iAVSwitch = AVSwitch()
 
 	def setColorFormat(configElement):
-		iAVSwitch.setColorFormat(configElement.value)
+		map = {"cvbs": 0, "rgb": 1, "svideo": 2, "yuv": 3}
+		iAVSwitch.setColorFormat(map[configElement.value])
 
 	def setAspectRatio(configElement):
-		iAVSwitch.setAspectRatio(configElement.value)
+		map = {"4_3_letterbox": 0, "4_3_panscan": 1, "16_9": 2, "16_9_always": 3, "16_10_letterbox": 4, "16_10_panscan": 5}
+		iAVSwitch.setAspectRatio(map[configElement.value])
 
 	def setSystem(configElement):
-		iAVSwitch.setSystem(configElement.value)
+		map = {"pal": 0, "ntsc": 1, "multinorm" : 2}
+		iAVSwitch.setSystem(map[configElement.value])
 
 	def setWSS(configElement):
 		iAVSwitch.setAspectWSS()