X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FVideomode%2FVideoHardware.py;h=adc63d2c404c8e1bb07fa86e129359054a8caddc;hp=02fdf9a5252454a7e6181f3685c01f9e87309381;hb=96ac5ba0afb7fb1ea96aee24fc497e76dc2c652b;hpb=09565fe7720e8e042712b42a9dc7aac2949130cb

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index 02fdf9a..adc63d2 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -2,6 +2,7 @@ from enigma import eTimer
 from Components.config import config, ConfigSelection, ConfigSubDict, ConfigYesNo
 
 from Tools.CList import CList
+from Tools.HardwareInfo import HardwareInfo
 
 # The "VideoHardware" is the interface to /proc/stb/video.
 # It generates hotplug events, and gives you the list of 
@@ -67,7 +68,7 @@ class VideoHardware:
 		else:
 			mode = config.av.videomode[port].value
 			force_widescreen = self.isWidescreenMode(port, mode)
-			is_widescreen = force_widescreen or config.av.aspect.value in ["16_9", "16_10"]
+			is_widescreen = force_widescreen or config.av.aspect.value in ("16_9", "16_10")
 			is_auto = config.av.aspect.value == "auto"
 			if is_widescreen:
 				if force_widescreen:
@@ -90,12 +91,15 @@ class VideoHardware:
 	def __init__(self):
 		self.last_modes_preferred =  [ ]
 		self.on_hotplug = CList()
-		self.standby = False
 		self.current_mode = None
 		self.current_port = None
 
 		self.readAvailableModes()
 
+		if self.modes.has_key("DVI-PC") and not self.getModeList("DVI-PC"):
+			print "remove DVI-PC because of not existing modes"
+			del self.modes["DVI-PC"]
+
 		self.createConfig()
 #		self.on_hotplug.append(self.createConfig)
 
@@ -107,7 +111,6 @@ class VideoHardware:
 		config.av.aspectratio.notifiers = [ ]
 		config.av.tvsystem.notifiers = [ ]
 		config.av.wss.notifiers = [ ]
-		AVSwitch.setInput = self.AVSwitchSetInput
 		AVSwitch.getOutputAspect = self.getOutputAspect
 
 		config.av.aspect.addNotifier(self.updateAspect)
@@ -120,12 +123,6 @@ 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]
@@ -232,20 +229,27 @@ class VideoHardware:
 		return res
 
 	def createConfig(self, *args):
-		# create list of output ports
-		portlist = self.getPortList()
+		hw_type = HardwareInfo().get_device_name()
+		lst = []
 
-		# create list of available modes
-		config.av.videoport = ConfigSelection(choices = [(port, _(port)) for port in portlist])
 		config.av.videomode = ConfigSubDict()
 		config.av.videorate = ConfigSubDict()
 
+		# create list of output ports
+		portlist = self.getPortList()
 		for port in portlist:
+			descr = port
+			if descr == 'DVI' and hw_type == 'dm500hd':
+				descr = 'HDMI'
+			lst.append((port, descr))
+
+			# create list of available modes
 			modes = self.getModeList(port)
 			if len(modes):
 				config.av.videomode[port] = ConfigSelection(choices = [mode for (mode, rates) in modes])
 			for (mode, rates) in modes:
 				config.av.videorate[mode] = ConfigSelection(choices = rates)
+		config.av.videoport = ConfigSelection(choices = lst)
 
 	def setConfiguredMode(self):
 		port = config.av.videoport.value
@@ -291,8 +295,9 @@ class VideoHardware:
 
 		force_widescreen = self.isWidescreenMode(port, mode)
 
-		is_widescreen = force_widescreen or config.av.aspect.value in ["16_9", "16_10"]
+		is_widescreen = force_widescreen or config.av.aspect.value in ("16_9", "16_10")
 		is_auto = config.av.aspect.value == "auto"
+		policy2 = "policy" # use main policy
 
 		if is_widescreen:
 			if force_widescreen:
@@ -300,6 +305,7 @@ class VideoHardware:
 			else:
 				aspect = {"16_9": "16:9", "16_10": "16:10"}[config.av.aspect.value]
 			policy = {"pillarbox": "panscan", "panscan": "letterbox", "nonlinear": "nonlinear", "scale": "bestfit"}[config.av.policy_43.value]
+			policy2 = {"letterbox": "letterbox", "panscan": "panscan", "scale": "bestfit"}[config.av.policy_169.value]
 		elif is_auto:
 			aspect = "any"
 			policy = "bestfit"
@@ -312,46 +318,14 @@ class VideoHardware:
 		else:
 			wss = "auto"
 
-		print "-> setting aspect, policy, wss", aspect, policy, wss
+		print "-> setting aspect, policy, policy2, wss", aspect, policy, policy2, 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)
+		try:
+			open("/proc/stb/video/policy2", "w").write(policy2)
+		except IOError:
+			pass
 
 config.av.edid_override = ConfigYesNo(default = False)
 video_hw = VideoHardware()