X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/96ac5ba0afb7fb1ea96aee24fc497e76dc2c652b..fc2f9f4c26846eb07b4dec7c327da470a6ae2297:/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py?ds=sidebyside

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index bceb6bc7..15f4d516 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -84,7 +84,8 @@ class VideoWizard(WizardLanguage, Rc):
 				descr = port
 				if descr == 'DVI' and hw_type == 'dm500hd':
 					descr = 'HDMI'
-				list.append((descr,port))
+				if port != "DVI-PC":
+					list.append((descr,port))
 		list.sort(key = lambda x: x[0])
 		print "listInputChannels:", list
 		return list
@@ -98,15 +99,19 @@ class VideoWizard(WizardLanguage, Rc):
 		print "input selection moved:", self.selection
 		self.inputSelect(self.selection)
 		if self["portpic"].instance is not None:
-			self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + self.selection + ".png"))
+			picname = self.selection
+			if picname == "DVI" and HardwareInfo().get_device_name() == "dm500hd":
+				picname = "HDMI"
+			self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + picname + ".png"))
 		
 	def inputSelect(self, port):
 		print "inputSelect:", port
 		modeList = self.hw.getModeList(self.selection)
 		print "modeList:", modeList
 		self.port = port
-		ratesList = self.listRates(modeList[0][0])
-		self.hw.setMode(port = port, mode = modeList[0][0], rate = ratesList[0][0])
+		if (len(modeList) > 0):
+			ratesList = self.listRates(modeList[0][0])
+			self.hw.setMode(port = port, mode = modeList[0][0], rate = ratesList[0][0])
 		
 	def listModes(self):
 		list = []
@@ -129,8 +134,12 @@ class VideoWizard(WizardLanguage, Rc):
 	def modeSelect(self, mode):
 		ratesList = self.listRates(mode)
 		print "ratesList:", ratesList
-		self.hw.setMode(port = self.port, mode = mode, rate = ratesList[0][0])
-		
+		if self.port == "DVI" and mode in ("720p", "1080i"):
+			self.rate = "multi"
+			self.hw.setMode(port = self.port, mode = mode, rate = "multi")
+		else:
+			self.hw.setMode(port = self.port, mode = mode, rate = ratesList[0][0])
+	
 	def listRates(self, querymode = None):
 		if querymode is None:
 			querymode = self.mode