Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / python / Components / AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 19aca24d885a33ac75bd92c60abcd4b95138da05..1f529cfd86a95ee00e906f9fee433bdd3275816d 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -29,27 +29,26 @@ class AVSwitch:
                eAVSwitch.getInstance().setVideomode(value)
 
        def getOutputAspect(self):
+               valstr = config.av.aspectratio.value
                if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3
-                       return 1.333333333
+                       return (4,3)
                elif valstr == "16_9": # auto ... 4:3 or 16:9
                        try:
                                aspect_str = open("/proc/stb/vmpeg/0/aspect", "r").read()
                                if aspect_str == "1": # 4:3
-                                       return 1.333333333
+                                       return (4,3)
                        except IOError:
                                pass
-                       return 1.777777778
                elif valstr in ("16_9_always", "16_9_letterbox"): # 16:9
-                       return 1.777777778
+                       pass
                elif valstr in ("16_10_letterbox", "16_10_panscan"): # 16:10
-                       return 1.6
-               print "unknown output aspect!"
-               return 1.0000
+                       return (16,10)
+               return (16,9)
 
        def getFramebufferScale(self):
                aspect = self.getOutputAspect()
                fb_size = getDesktop(0).size()
-               return aspect / ((1.0 * fb_size.width()) / fb_size.height())
+               return (aspect[0] * fb_size.height(), aspect[1] * fb_size.width())
 
        def getAspectRatioSetting(self):
                valstr = config.av.aspectratio.value