work on asynchron pic loading... to get rid of spinning wheels

[vuplus_dvbapp] / lib / python / Components / AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index d3224fd..7ac2bb9 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,5 +1,6 @@
-from config import config, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
+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) }
@@ -27,6 +28,21 @@ class AVSwitch:
        def setSystem(self, value):
                eAVSwitch.getInstance().setVideomode(value)
 
+       def getOutputAspect(self):
+               if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3
+                       return 1.333333333
+               elif valstr == "16_9": # auto ... 4:3 or 16:9
+                       # TODO: here we must retrieve the current video aspect ratio...
+                       # because the TV can run in 4:3 or in 16:9 mode.. (switched by wss or scart pin8)
+                       # until we have done this we always return the scale value for 16:9!!
+                       return 1.777777778
+               elif valstr in ("16_9_always", "16_9_letterbox"): # 16:9
+                       return 1.777777778
+               elif valstr in ("16_10_letterbox", "16_10_panscan"): # 16:10
+                       return 1.6
+               print "unknown output aspect!"
+               return 1.0000
+
        def getAspectRatioSetting(self):
                valstr = config.av.aspectratio.value
                if valstr == "4_3_letterbox":
@@ -49,7 +65,10 @@ class AVSwitch:
                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)
@@ -91,6 +110,31 @@ def InitAVSwitch():
                        "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)
@@ -120,3 +164,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)