From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 30 Dec 2009 10:13:52 +0000 (+0100)
Subject: Merge branch 'bug_262_no_more_ask_50hz' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~121
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/b0332cff6d1120f3b84696ce6b33a185bcda88e9?hp=5a02c1ec2dd264366daf9988e436196241b6472d

Merge branch 'bug_262_no_more_ask_50hz' into experimental
---

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index cd1529aa..49b5d53d 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -131,8 +131,11 @@ 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.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
diff --git a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
index 29ac4297..5dea661d 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
+++ b/lib/python/Plugins/SystemPlugins/Videomode/videowizard.xml
@@ -20,7 +20,7 @@ self.selectKey("DOWN")
 self["portpic"].hide()
 		</code>
 	</step>
-	<step id="rateselection" nextstep="dvirateintroduction" timeout="20" timeoutaction="selectnext">
+	<step id="rateselection" nextstep="end" timeout="20" timeoutaction="selectnext">
 		<condition>
 self.condition = (self.port != "DVI" or self.mode == "PC")
 		</condition>		
@@ -33,7 +33,7 @@ self.selectKey("UP")
 self.selectKey("DOWN")
 		</code>
 	</step>
-	<step id="dvirateintroduction" nextstep="dvirateselection">
+	<!--step id="dvirateintroduction" nextstep="dvirateselection">
 		<condition>
 self.condition = (self.port == "DVI" and self.mode in ["720p", "1080i"])
 		</condition>
@@ -89,7 +89,7 @@ self.selectKey("UP")
 self.selectKey("DOWN")
 self.rateSelect("50Hz")
 		</code>
-	</step>
+	</step-->
 	<step id="end">
 		<code>
 self.hw.saveMode(self.port, self.mode, self.rate)