better netmask parsing

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

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 8a7bd8d1e3e6b69f3e27a501c0e7bbef95f577c8..8f99b98ec8fd6c193d3494d4e1d9ba9ab34ef363 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,6 +1,6 @@
-from config import config, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
-import os
-from enigma import *
+from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
+from enigma import eAVSwitch
+from SystemInfo import SystemInfo
 
 class AVSwitch:
        INPUT = { "ENCODER": (0, 4), "SCART": (1, 3), "AUX": (2, 4) }
@@ -42,19 +42,24 @@ class AVSwitch:
                        val = 4
                elif valstr == "16_10_panscan":
                        val = 5
+               elif valstr == "16_9_letterbox":
+                       val = 6
                return val
 
        def setAspectWSS(self, aspect=None):
                if aspect is None:
                        aspect = self.getAspectRatioSetting()
                if aspect == 0 or aspect == 1: # letterbox or panscan
-                       value = 3 # 4:3_full_format
+                       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: # always 16:9
+               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
@@ -67,7 +72,7 @@ class AVSwitch:
                        value = 2 # 12 V
                elif aspect == 2: # 16:9
                        value = 4 # auto
-               elif aspect == 3 or aspect == 4 or aspect == 5: # always 16:9
+               elif aspect == 3 or aspect == 4 or aspect == 5 or aspect == 6: # always 16:9
                        value = 1 # 6V
                eAVSwitch.getInstance().setSlowblank(value)
 
@@ -87,8 +92,34 @@ def InitAVSwitch():
                        "16_9": _("16:9"), 
                        "16_9_always": _("16:9 always"),
                        "16_10_letterbox": _("16:10 Letterbox"),
-                       "16_10_panscan": _("16:10 PanScan")}, 
+                       "16_10_panscan": _("16:10 PanScan"), 
+                       "16_9_letterbox": _("16:9 Letterbox")}, 
                        default = "4_3_letterbox")
+
+       config.av.aspect = ConfigSelection(choices={
+                       "4_3": _("4:3"),
+                       "16_9": _("16:9"), 
+                       "16_10": _("16:10"),
+                       "auto": _("Automatic")},
+                       default = "auto")
+       config.av.policy_169 = ConfigSelection(choices={
+                               # TRANSLATORS: (aspect ratio policy: black bars on top/bottom) in doubt, keep english term.
+                       "letterbox": _("Letterbox"), 
+                               # TRANSLATORS: (aspect ratio policy: cropped content on left/right) in doubt, keep english term
+                       "panscan": _("Pan&Scan"),  
+                               # TRANSLATORS: (aspect ratio policy: display as fullscreen, even if this breaks the aspect)
+                       "scale": _("Just Scale")},
+                       default = "letterbox")
+       config.av.policy_43 = ConfigSelection(choices={
+                               # 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"),  
+                               # TRANSLATORS: (aspect ratio policy: display as fullscreen, with stretching the left/right)
+                       "nonlinear": _("Nonlinear"),  
+                               # TRANSLATORS: (aspect ratio policy: display as fullscreen, even if this breaks the aspect)
+                       "scale": _("Just Scale")},
+                       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)
@@ -101,7 +132,7 @@ def InitAVSwitch():
                iAVSwitch.setColorFormat(map[configElement.value])
 
        def setAspectRatio(configElement):
-               map = {"4_3_letterbox": 0, "4_3_panscan": 1, "16_9": 2, "16_9_always": 3, "16_10_letterbox": 4, "16_10_panscan": 5}
+               map = {"4_3_letterbox": 0, "4_3_panscan": 1, "16_9": 2, "16_9_always": 3, "16_10_letterbox": 4, "16_10_panscan": 5, "16_9_letterbox" : 6}
                iAVSwitch.setAspectRatio(map[configElement.value])
 
        def setSystem(configElement):
@@ -118,3 +149,30 @@ def InitAVSwitch():
        config.av.wss.addNotifier(setWSS)
 
        iAVSwitch.setInput("ENCODER") # init on startup
+       SystemInfo["ScartSwitch"] = eAVSwitch.getInstance().haveScartSwitch()
+
+       try:
+               can_downmix = open("/proc/stb/audio/ac3_choices", "r").read()[:-1].find("downmix") != -1
+       except:
+               can_downmix = False
+
+       SystemInfo["CanDownmixAC3"] = can_downmix
+       if can_downmix:
+               def setAC3Downmix(configElement):
+                       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)