X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2f2b96fef51a5b4bfeb599f9785ecb6315c1fd4d..06c6fcf1e814c32ef8aaa6cb6f5e3a567f64c866:/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index d73610a5..43543bb1 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -46,18 +46,22 @@ class VideoHardware:
 		"1366x768" : { 60: "1366x768"},
 		"1366x768 multi" : { 50: "1366x768", 60: "1366x768_50"},
 		"1280x768": { 60: "1280x768"},
-		"640x480" : { 60: "640x480"} 
+		"640x480" : { 60: "640x480"}
 	}
 
 	modes["Scart"] = ["PAL", "NTSC", "Multi"]
 	modes["YPbPr"] = ["720p", "1080i"]
 	modes["DVI"] = ["720p", "1080i", "PC"]
+	modes["DVI-PC"] = ["PC"]
 
 	widescreen_modes = set(["720p", "1080i"])
 
 	def __init__(self):
 		self.last_modes_preferred =  [ ]
 		self.on_hotplug = CList()
+		self.standby = False
+		self.current_mode = None
+		self.current_port = None
 
 		self.readAvailableModes()
 
@@ -66,7 +70,16 @@ class VideoHardware:
 
 		self.readPreferredModes()
 
+		# take over old AVSwitch component :)
+		from Components.AVSwitch import AVSwitch
+#		config.av.colorformat.notifiers = [ ] 
+		config.av.aspectratio.notifiers = [ ]
+		config.av.tvsystem.notifiers = [ ]
+		config.av.wss.notifiers = [ ]
+		AVSwitch.setInput = self.AVSwitchSetInput
+
 		config.av.aspect.addNotifier(self.updateAspect)
+		config.av.wss.addNotifier(self.updateAspect)
 		config.av.policy_169.addNotifier(self.updateAspect)
 		config.av.policy_43.addNotifier(self.updateAspect)
 
@@ -75,6 +88,12 @@ class VideoHardware:
 #		self.timer.callback.append(self.readPreferredModes)
 #		self.timer.start(1000)
 
+		config.av.colorformat.addNotifier(self.updateFastblank) 
+
+	def AVSwitchSetInput(self, mode):
+		self.standby = mode == "SCART"
+		self.updateStandby()
+
 	def readAvailableModes(self):
 		try:
 			modes = open("/proc/stb/video/videomode_choices").read()[:-1]
@@ -117,6 +136,7 @@ class VideoHardware:
 		print "setMode - port:", port, "mode:", mode, "rate:", rate
 		# we can ignore "port"
 		self.current_mode = mode
+		self.current_port = port
 		modes = self.rates[mode][rate]
 
 		mode_50 = modes.get(50)
@@ -127,8 +147,8 @@ class VideoHardware:
 			mode_60 = mode_50
 
 		try:
-			open("/proc/stb/video/videomode_60hz", "w").write(mode_50)
-			open("/proc/stb/video/videomode_50hz", "w").write(mode_60)
+			open("/proc/stb/video/videomode_50hz", "w").write(mode_50)
+			open("/proc/stb/video/videomode_60hz", "w").write(mode_60)
 		except IOError:
 			try:
 				# fallback if no possibility to setup 50/60 hz mode
@@ -145,8 +165,11 @@ class VideoHardware:
 
 	def saveMode(self, port, mode, rate):
 		config.av.videoport.value = port
+		config.av.videoport.save()
 		config.av.videomode[port].value = mode
+		config.av.videomode[port].save()
 		config.av.videorate[mode].value = rate
+		config.av.videorate[mode].save()
 
 	def isPortAvailable(self, port):
 		# fixme
@@ -205,7 +228,6 @@ class VideoHardware:
 
 		rate = config.av.videorate[mode].value
 		self.setMode(port, mode, rate)
-		
 
 	def updateAspect(self, cfgelement):
 		# determine aspect = {any,4:3,16:9,16:10}
@@ -252,9 +274,51 @@ class VideoHardware:
 			aspect = "4:3"
 			policy = {"letterbox": "letterbox", "panscan": "panscan", "scale": "bestfit"}[config.av.policy_169.value]
 
-		print "-> setting aspect, policy", aspect, policy
+		if not config.av.wss.value:
+			wss = "auto(4:3_off)"
+		else:
+			wss = "auto"
+
+		print "-> setting aspect, policy, wss", aspect, policy, wss
 		open("/proc/stb/video/aspect", "w").write(aspect)
 		open("/proc/stb/video/policy", "w").write(policy)
+		open("/proc/stb/denc/0/wss", "w").write(wss)
+		self.updateSlowblank()
+		self.updateFastblank()
+
+	def updateSlowblank(self):
+		if self.standby:
+			from Components.SystemInfo import SystemInfo
+			if SystemInfo["ScartSwitch"]:
+				input = "scart"
+				sb = "vcr"
+			else:
+				input = "off"
+				sb = "0"
+		else:
+			input = "encoder"
+			sb = "auto"
+
+		open("/proc/stb/avs/0/sb", "w").write(sb)
+		open("/proc/stb/avs/0/input", "w").write(input)
+
+	def updateStandby(self):
+		self.updateSlowblank()
+		self.updateFastblank()
+
+	def updateFastblank(self, *args):
+		if self.standby:
+			from Components.SystemInfo import SystemInfo
+			if SystemInfo["ScartSwitch"]:
+				fb = "vcr"
+			else:
+				fb = "low"
+		else:
+			if self.current_port == "Scart" and config.av.colorformat.value == "rgb":
+				fb = "high"
+			else:
+				fb = "low"
+		open("/proc/stb/avs/0/fb", "w").write(fb)
 
 config.av.edid_override = ConfigYesNo(default = False)
 video_hw = VideoHardware()