X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/35b4469fbb9f5bf80bba60c29916057aaa3c5bd0..01f6932815a6a21ab46bb420be093685378b43dd:/lib/python/Components/AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 0b285cfd..b36dc4a2 100644
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -12,23 +12,30 @@ class AVSwitch:
 		
 	def setAspectRatio(self, value):
 		eAVSwitch.getInstance().setAspectRatio(value)
+		self.checkWSS()
 
 	def setSystem(self, value):
 		eAVSwitch.getInstance().setVideomode(value)
-
-	def setWSS(self, value):
-		if currentConfigSelectionElement(config.av.wss) == "off":
-			writevalue = "off"
-		elif currentConfigSelectionElement(config.av.wss) == "auto":
-			writevalue = "auto"
-		elif currentConfigSelectionElement(config.av.wss) == "auto_no4_3":
-			writevalue = "auto(4:3_off)"
+		
+	def checkWSS(self):
+		if currentConfigSelectionElement(config.av.aspectratio) == "4_3_letterbox" or currentConfigSelectionElement(config.av.aspectratio) == "4_3_panscan":
+			writevalue = "4:3_full_format"
+		elif currentConfigSelectionElement(config.av.aspectratio) == "16_9":
+			if currentConfigSelectionElement(config.av.wss) == "off":
+				writevalue = "auto(4:3_off)"
+			else:
+				writevalue = "auto"
+		elif currentConfigSelectionElement(config.av.aspectratio) == "16_9_always":
+			writevalue = "16:9_full_format"
 		try:
 			file = open("/proc/stb/denc/0/wss", "w")
 			file.write(writevalue)
 			file.close()
 		except:
 			print "[AVSwitch.py] Error writing to /proc/stb/denc/0/wss"
+
+	def setWSS(self, value = None):
+		self.checkWSS()
 	
 	def setInput(self, input):
 		eAVSwitch.getInstance().setInput(self.INPUT[input])
@@ -41,25 +48,25 @@ def InitAVSwitch():
 	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, (("off", _("Off")), ("auto", _("Auto")), ("auto_no4_3", _("Auto (disable on 4:3)"))) )
+	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.setWSS(configElement.value)
 
 	# 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);
+	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