PluginBrowser.py: update pluginlist max every 60 minutes (thx to

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

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 1b27418734b340c17e40172174544b863a1340d3..8f4255b817c099178f8eeb7cdb8fc3cfe5d8c073 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,33 +1,44 @@
-from config import config, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
-from enigma import eAVSwitch
+from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, \
+       ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigNumber
+from enigma import eAVSwitch, getDesktop
 from SystemInfo import SystemInfo
 
 class AVSwitch:
-       INPUT = { "ENCODER": (0, 4), "SCART": (1, 3), "AUX": (2, 4) }
-
        def setInput(self, input):
-               eAVSwitch.getInstance().setInput(self.INPUT[input][0])
-               if self.INPUT[input][1] == 4:
-                       aspect = self.getAspectRatioSetting()
-                       self.setAspectWSS(aspect)
-                       self.setAspectSlowBlank(aspect)
-               else:
-                       eAVSwitch.getInstance().setSlowblank(self.INPUT[input][1])
-               # FIXME why do we have to reset the colorformat? bug in avs-driver?
-               map = {"cvbs": 0, "rgb": 1, "svideo": 2, "yuv": 3}
-               eAVSwitch.getInstance().setColorFormat(map[config.av.colorformat.value])
+               INPUT = { "ENCODER": 0, "SCART": 1, "AUX": 2 }
+               eAVSwitch.getInstance().setInput(INPUT[input])
 
        def setColorFormat(self, value):
                eAVSwitch.getInstance().setColorFormat(value)
 
        def setAspectRatio(self, value):
                eAVSwitch.getInstance().setAspectRatio(value)
-               self.setAspectWSS(value)
-               self.setAspectSlowBlank(value)
 
        def setSystem(self, value):
                eAVSwitch.getInstance().setVideomode(value)
 
+       def getOutputAspect(self):
+               valstr = config.av.aspectratio.value
+               if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3
+                       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 (4,3)
+                       except IOError:
+                               pass
+               elif valstr in ("16_9_always", "16_9_letterbox"): # 16:9
+                       pass
+               elif valstr in ("16_10_letterbox", "16_10_panscan"): # 16:10
+                       return (16,10)
+               return (16,9)
+
+       def getFramebufferScale(self):
+               aspect = self.getOutputAspect()
+               fb_size = getDesktop(0).size()
+               return (aspect[0] * fb_size.height(), aspect[1] * fb_size.width())
+
        def getAspectRatioSetting(self):
                valstr = config.av.aspectratio.value
                if valstr == "4_3_letterbox":
@@ -47,35 +58,12 @@ class AVSwitch:
                return val
 
        def setAspectWSS(self, aspect=None):
-               if aspect is None:
-                       aspect = self.getAspectRatioSetting()
-               if aspect == 0 or aspect == 1: # letterbox or panscan
-                       if not config.av.wss.value:
-                               value = 0 # wss off
-                       else:
-                               value = 3 # 4:3_full_format
-               elif aspect == 2: # 16:9
-                       if not config.av.wss.value:
-                               value = 2 # auto(4:3_off)
-                       else:
-                               value = 1 # auto
-               elif aspect == 3 or aspect == 6: # always 16:9
-                       value = 4 # 16:9_full_format
-               elif aspect == 4 or aspect == 5: # 16:10
-                       value = 10 # 14:9_full_format
+               if not config.av.wss.value:
+                       value = 2 # auto(4:3_off)
+               else:
+                       value = 1 # auto
                eAVSwitch.getInstance().setWSS(value)
 
-       def setAspectSlowBlank(self, aspect=None):
-               if aspect is None:
-                       aspect = self.getAspectRatioSetting()
-               if aspect == 0 or aspect == 1: # letterbox or panscan
-                       value = 2 # 12 V
-               elif aspect == 2: # 16:9
-                       value = 4 # auto
-               elif aspect == 3 or aspect == 4 or aspect == 5 or aspect == 6: # always 16:9
-                       value = 1 # 6V
-               eAVSwitch.getInstance().setSlowblank(value)
-
 def InitAVSwitch():
        config.av = ConfigSubsection()
        config.av.yuvenabled = ConfigBoolean(default=False)
@@ -111,7 +99,7 @@ def InitAVSwitch():
                        "scale": _("Just Scale")},
                        default = "letterbox")
        config.av.policy_43 = ConfigSelection(choices={
-                               # TRANSLATORS: (aspect ratio policy: black bars on top/bottom) in doubt, keep english term.
+                               # TRANSLATORS: (aspect ratio policy: black bars on left/right) in doubt, keep english term.
                        "pillarbox": _("Pillarbox"), 
                                # TRANSLATORS: (aspect ratio policy: cropped content on left/right) in doubt, keep english term
                        "panscan": _("Pan&Scan"),  
@@ -119,10 +107,12 @@ def InitAVSwitch():
                        "nonlinear": _("Nonlinear"),  
                                # TRANSLATORS: (aspect ratio policy: display as fullscreen, even if this breaks the aspect)
                        "scale": _("Just Scale")},
-                       default = "panscan")
+                       default = "pillarbox")
        config.av.tvsystem = ConfigSelection(choices = {"pal": _("PAL"), "ntsc": _("NTSC"), "multinorm": _("multinorm")}, default="pal")
        config.av.wss = ConfigEnableDisable(default = True)
        config.av.defaultac3 = ConfigYesNo(default = False)
+       config.av.generalAC3delay = ConfigNumber(default = 0)
+       config.av.generalPCMdelay = ConfigNumber(default = 0)
        config.av.vcrswitch = ConfigEnableDisable(default = False)
 
        iAVSwitch = AVSwitch()
@@ -162,3 +152,17 @@ def InitAVSwitch():
                        open("/proc/stb/audio/ac3", "w").write(configElement.value and "downmix" or "passthrough")
                config.av.downmix_ac3 = ConfigYesNo(default = True)
                config.av.downmix_ac3.addNotifier(setAC3Downmix)
+
+       try:
+               can_osd_alpha = open("/proc/stb/video/alpha", "r") and True or False
+       except:
+               can_osd_alpha = False
+
+       SystemInfo["CanChangeOsdAlpha"] = can_osd_alpha
+
+       def setAlpha(config):
+               open("/proc/stb/video/alpha", "w").write(str(config.value))
+
+       if can_osd_alpha:
+               config.av.osd_alpha = ConfigSlider(default=255, limits=(0,255))
+               config.av.osd_alpha.addNotifier(setAlpha)