X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FVideomode%2FVideoHardware.py;h=71529a037b569db725229b23bc12a56ab48dc5c6;hp=7149504a5603a6584d867ea343663b5a1223788c;hb=344ffd10a4f5b54546fe5e382dbf40a8cf7ecdbb;hpb=7647e42f245ae741abd45fed11f416613e103e15

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index 7149504..71529a0 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -67,7 +67,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 +90,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 +110,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 +122,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]
@@ -291,7 +287,7 @@ 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
 
@@ -322,42 +318,6 @@ class VideoHardware:
 			open("/proc/stb/video/policy2", "w").write(policy2)
 		except IOError:
 			pass
-		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()