X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/307b1a3a29f51944baf8866292f6150f6aa8ca62..ecd15d83806de513514e2ef84892b6d30c64cc8c:/lib/python/Components/AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 00350cbb..2658f9ba 100644
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,34 +1,25 @@
-from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
+from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, \
+	ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigSelectionNumber, ConfigNothing, NoSave
 from enigma import eAVSwitch, getDesktop
 from SystemInfo import SystemInfo
+from os import path as os_path
 
 class AVSwitch:
-	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?
-		map = {"cvbs": 0, "rgb": 1, "svideo": 2, "yuv": 3}
-		eAVSwitch.getInstance().setColorFormat(map[config.av.colorformat.value])
+		INPUT = { "ENCODER": 0, "SCART": 1, "AUX": 2 }
+		eAVSwitch.getInstance().setInput(INPUT[input])
 
 	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):
 		eAVSwitch.getInstance().setVideomode(value)
 
 	def getOutputAspect(self):
+		valstr = config.av.aspectratio.value
 		if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3
 			return (4,3)
 		elif valstr == "16_9": # auto ... 4:3 or 16:9
@@ -68,35 +59,12 @@ class AVSwitch:
 		return val
 
 	def setAspectWSS(self, aspect=None):
-		if aspect is None:
-			aspect = self.getAspectRatioSetting()
-		if aspect == 0 or aspect == 1: # letterbox or panscan
-			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 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
+		if not config.av.wss.value:
+			value = 2 # auto(4:3_off)
+		else:
+			value = 1 # auto
 		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 or aspect == 6: # always 16:9
-			value = 1 # 6V
-		eAVSwitch.getInstance().setSlowblank(value)
-
 def InitAVSwitch():
 	config.av = ConfigSubsection()
 	config.av.yuvenabled = ConfigBoolean(default=False)
@@ -144,6 +112,8 @@ def InitAVSwitch():
 	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.generalAC3delay = ConfigSelectionNumber(-1000, 1000, 25, default = 0)
+	config.av.generalPCMdelay = ConfigSelectionNumber(-1000, 1000, 25, default = 0)
 	config.av.vcrswitch = ConfigEnableDisable(default = False)
 
 	iAVSwitch = AVSwitch()
@@ -197,3 +167,19 @@ def InitAVSwitch():
 	if can_osd_alpha:
 		config.av.osd_alpha = ConfigSlider(default=255, limits=(0,255))
 		config.av.osd_alpha.addNotifier(setAlpha)
+
+	if os_path.exists("/proc/stb/vmpeg/0/pep_scaler_sharpness"):
+		def setScaler_sharpness(config):
+			myval = int(config.value)
+			try:
+				print "--> setting scaler_sharpness to: %0.8X" % myval
+				open("/proc/stb/vmpeg/0/pep_scaler_sharpness", "w").write("%0.8X" % myval)
+				open("/proc/stb/vmpeg/0/pep_apply", "w").write("1")
+			except IOError:
+				print "couldn't write pep_scaler_sharpness"
+
+		config.av.scaler_sharpness = ConfigSlider(default=13, limits=(0,26))
+		config.av.scaler_sharpness.addNotifier(setScaler_sharpness)
+	else:
+		config.av.scaler_sharpness = NoSave(ConfigNothing())
+