X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/921b91f314f96d4c13799e51f591527016df09e4..bb349d44c5c3e963d25f31c085e92407d2c2b0a9:/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index 9e5051c9..02fdf9a5 100644
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -1,15 +1,5 @@
-from Screens.Screen import Screen
-from Plugins.Plugin import PluginDescriptor
-
 from enigma import eTimer
-
-from Components.ActionMap import ActionMap
-from Components.Label import Label
-from Components.Pixmap import Pixmap
-from Screens.MessageBox import MessageBox
-from Screens.Setup import SetupSummary
-from Components.ConfigList import ConfigListScreen
-from Components.config import getConfigListEntry, config, ConfigSelection, ConfigSubDict, ConfigYesNo
+from Components.config import config, ConfigSelection, ConfigSubDict, ConfigYesNo
 
 from Tools.CList import CList
 
@@ -47,19 +37,19 @@ class VideoHardware:
 								"multi":	{ 50: "1080i50", 60: "1080i" } }
 
 	rates["PC"] = { 
-		"1024x768": { 60: "1024x768"}, # not possible on DM7025
-		"800x600" : { 60: "800x600"},  # also not possible
-		"720x480" : { 60: "720x480"},
-		"720x576" : { 60: "720x576"},
-		"1280x720": { 60: "1280x720"},
-		"1280x720 multi": { 50: "1280x720_50", 60: "1280x720"},
+		"1024x768": { 60: "1024x768" }, # not possible on DM7025
+		"800x600" : { 60: "800x600" },  # also not possible
+		"720x480" : { 60: "720x480" },
+		"720x576" : { 60: "720x576" },
+		"1280x720": { 60: "1280x720" },
+		"1280x720 multi": { 50: "1280x720_50", 60: "1280x720" },
 		"1920x1080": { 60: "1920x1080"},
-		"1920x1080 multi": { 50: "1920x1080", 60: "1920x1080_50"},
+		"1920x1080 multi": { 50: "1920x1080", 60: "1920x1080_50" },
 		"1280x1024" : { 60: "1280x1024"},
 		"1366x768" : { 60: "1366x768"},
-		"1366x768 multi" : { 50: "1366x768", 60: "1366x768_50"},
-		"1280x768": { 60: "1280x768"},
-		"640x480" : { 60: "640x480"}
+		"1366x768 multi" : { 50: "1366x768", 60: "1366x768_50" },
+		"1280x768": { 60: "1280x768" },
+		"640x480" : { 60: "640x480" }
 	}
 
 	modes["Scart"] = ["PAL", "NTSC", "Multi"]
@@ -69,6 +59,34 @@ class VideoHardware:
 
 	widescreen_modes = set(["720p", "1080i"])
 
+	def getOutputAspect(self):
+		ret = (16,9)
+		port = config.av.videoport.value
+		if port not in config.av.videomode:
+			print "current port not available in getOutputAspect!!! force 16:9"
+		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_auto = config.av.aspect.value == "auto"
+			if is_widescreen:
+				if force_widescreen:
+					pass
+				else:
+					aspect = {"16_9": "16:9", "16_10": "16:10"}[config.av.aspect.value]
+					if aspect == "16:10":
+						ret = (16,10)
+			elif is_auto:
+				try:
+					aspect_str = open("/proc/stb/vmpeg/0/aspect", "r").read()
+					if aspect_str == "1": # 4:3
+						ret = (4,3)
+				except IOError:
+					pass
+			else:  # 4:3
+				ret = (4,3)
+		return ret
+
 	def __init__(self):
 		self.last_modes_preferred =  [ ]
 		self.on_hotplug = CList()
@@ -90,6 +108,7 @@ class VideoHardware:
 		config.av.tvsystem.notifiers = [ ]
 		config.av.wss.notifiers = [ ]
 		AVSwitch.setInput = self.AVSwitchSetInput
+		AVSwitch.getOutputAspect = self.getOutputAspect
 
 		config.av.aspect.addNotifier(self.updateAspect)
 		config.av.wss.addNotifier(self.updateAspect)
@@ -177,6 +196,7 @@ class VideoHardware:
 		self.updateAspect(None)
 
 	def saveMode(self, port, mode, rate):
+		print "saveMode", port, mode, rate
 		config.av.videoport.value = port
 		config.av.videoport.save()
 		config.av.videomode[port].value = mode