X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c06f79c0451ca844f89809058a2767a1a319b137..5f45eb94454f5787d87725c9d2a73cecc84eda11:/lib/python/Components/AVSwitch.py?ds=sidebyside

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 22d24dfc..19fccf54 100644
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -3,52 +3,108 @@ import os
 from enigma import *
 
 class AVSwitch:
-	INPUT = { "ENCODER": 0, "SCART": 1, "AUX": 2 }
-	def __init__(self):
-		pass
+	INPUT = { "ENCODER": (0, 4), "SCART": (1, 3), "AUX": (2, 4) }
+
+	def setInput(self, input):
+		eAVSwitch.getInstance().setInput(self.INPUT[input][0])
+		if self.INPUT[input][1] == 4:
+			aspect = self.getAspectRatioSetting()
+			self.setAspectWSS(aspect)
+			self.setAspectSlowBlank(aspect)
+		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)
 
 	def setColorFormat(self, value):
 		eAVSwitch.getInstance().setColorFormat(value)
-		
+
 	def setAspectRatio(self, value):
 		eAVSwitch.getInstance().setAspectRatio(value)
+		self.setAspectWSS(value)
+		self.setAspectSlowBlank(value)
 
 	def setSystem(self, value):
-		print "system:" + str(value)
 		eAVSwitch.getInstance().setVideomode(value)
 
-	def setWSS(self, value):
-		#print "wss:" + str(value)
-		pass
-	
-	def setInput(self, input):
-		eAVSwitch.getInstance().setInput(self.INPUT[input])
+	def getAspectRatioSetting(self):
+		valstr = currentConfigSelectionElement(config.av.aspectratio)
+		if valstr == "4_3_letterbox":
+			val = 0
+		elif valstr == "4_3_panscan":
+			val = 1
+		elif valstr == "16_9":
+			val = 2
+		elif valstr == "16_9_always":
+			val = 3
+		elif valstr == "16_10_letterbox":
+			val = 4
+		elif valstr == "16_10_panscan":
+			val = 5
+		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
+		elif aspect == 2: # 16:9
+			if currentConfigSelectionElement(config.av.wss) == "off":
+				value = 2 # auto(4:3_off)
+			else:
+				value = 1 # auto
+		elif aspect == 3: # always 16:9
+			value = 4 # 16:9_full_format
+		elif aspect == 4 or aspect == 5: # 16:10
+			value = 10 # 14:9_full_format
+		eAVSwitch.getInstance().setWSS(value)
+
+	def setAspectSlowBlank(self, aspect=None):
+		if aspect is None:
+			aspect = self.getAspectRatioSetting()
+		if aspect == 0 or aspect == 1: # letterbox or panscan
+			value = 2 # 12 V
+		elif aspect == 2: # 16:9
+			value = 4 # auto
+		elif aspect == 3 or aspect == 4 or aspect == 5: # always 16:9
+			value = 1 # 6V
+		eAVSwitch.getInstance().setSlowblank(value)
 
 def InitAVSwitch():
 	config.av = ConfigSubsection();
-	config.av.colorformat = configElement("config.av.colorformat", configSelection, 1, (("cvbs", _("CVBS")), ("rgb", _("RGB")), ("svideo", _("S-Video")) ));
-	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"))) );
-	#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, (("enable", _("Enable")), ("disable", _("Disable"))) );
-	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"))));
+	config.av.yuvenabled = configElementBoolean("config.av.yuvenabled", 0)
+	colorformat_choices = ( ("cvbs", _("CVBS")), ("rgb", _("RGB")), ("svideo", _("S-Video")), ("yuv", _("YPbPr")) )
+	
+	# 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"))))
 
 	iAVSwitch = AVSwitch()
 
 	def setColorFormat(configElement):
-		iAVSwitch.setColorFormat(configElement.value);
+		iAVSwitch.setColorFormat(configElement.value)
+
 	def setAspectRatio(configElement):
-		iAVSwitch.setAspectRatio(configElement.value);
+		iAVSwitch.setAspectRatio(configElement.value)
+
 	def setSystem(configElement):
-		iAVSwitch.setSystem(configElement.value);
+		iAVSwitch.setSystem(configElement.value)
+
 	def setWSS(configElement):
-		iAVSwitch.setWSS(configElement.value);
+		iAVSwitch.setAspectWSS()
 
 	# this will call the "setup-val" initial
-	config.av.colorformat.addNotifier(setColorFormat);
-	config.av.aspectratio.addNotifier(setAspectRatio);
-	config.av.tvsystem.addNotifier(setSystem);
-	config.av.wss.addNotifier(setWSS);
-	
-	iAVSwitch.setInput("ENCODER") # init on startup
\ No newline at end of file
+	config.av.colorformat.addNotifier(setColorFormat)
+	config.av.aspectratio.addNotifier(setAspectRatio)
+	config.av.tvsystem.addNotifier(setSystem)
+	config.av.wss.addNotifier(setWSS)
+
+	iAVSwitch.setInput("ENCODER") # init on startup