From: hschang <chang@dev3>
Date: Wed, 14 May 2014 10:43:42 +0000 (+0900)
Subject: Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into... 
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=24685eb3037efb18faf6f29a23b20fca85592145;hp=e27fb3a5db02dec41634d327aeddaab119c2f02b

Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into vuplus_experimental
---

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index aef9d8d..fb07cf3 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -56,8 +56,10 @@ class VideoHardware:
 	}
 
 	widescreen_modes = set(["720p", "1080i", "1080p"])
-	hdmi_hw_types = set(["dm500", "dm800se", "dm7020hd", "bm750", "solo", "uno", "ultimo", "solo2", "duo2"])
-	hdmi_pc_hw_types = set(["dm500", "dm800se", "dm7020hd", "bm750", "solo", "uno", "ultimo", "solo2", "duo2"])
+	hdmi_hw_types = set(["dm500", "dm800se", "dm7020hd", "bm750", "solo", "uno", "ultimo", "solo2", "duo2", "solose"])
+	hdmi_pc_hw_types = set(["dm500", "dm800se", "dm7020hd", "bm750", "solo", "uno", "ultimo", "solo2", "duo2", "solose"])
+	noscart_hw_types = set(["solose"])
+	noypbpr_hw_types = set(["solose"])
 
 	def getDeviceName(self):
 		device_name = "unknown"
@@ -72,7 +74,7 @@ class VideoHardware:
 		return device_name
 
 	def isVumodel(self, hw_type):
-		return hw_type in set(["bm750", "solo", "uno", "ultimo", "solo2", "duo2"])
+		return hw_type in set(["bm750", "solo", "uno", "ultimo", "solo2", "duo2", "solose"])
 
 	# re-define AVSwitch.getOutputAspect
 	def getOutputAspect(self):
@@ -110,6 +112,16 @@ class VideoHardware:
 			print "remove DVI-PC because it does not exist."
 			del self.modes["DVI-PC"]
 
+		if self.isNoScart(self.getDeviceName()):
+			if self.modes.has_key("Scart"):
+				print "remove Scart because it does not exist."
+				del self.modes["Scart"]
+
+		if self.isNoYPbPr(self.getDeviceName()):
+			if self.modes.has_key("YPbPr"):
+				print "remove YPbPr because it does not exist."
+				del self.modes["YPbPr"]
+
 		self.createConfig()
 
 		self.readPreferredModes()
@@ -168,6 +180,14 @@ class VideoHardware:
 	def isWidescreenMode(self, mode):
 		return mode in self.widescreen_modes
 
+	# check if Scart is not available
+	def isNoScart(self, hw_type):
+		return hw_type in self.noscart_hw_types
+
+	# check if YPbPr is not available
+	def isNoYPbPr(self, hw_type):
+		return hw_type in self.noypbpr_hw_types
+
 	# check if rate is available for mode
 	def isModeAvailable(self, port, mode, rate):
 		rate = self.rates[mode][rate]