fix ait dump w/ multi-section

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

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
old mode 100644 (file)
new mode 100755 (executable)
index bc2a66a..b5f6b1f
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,5 +1,5 @@
 from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, \
-       ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigNumber, ConfigNothing, NoSave
+       ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigSelectionNumber, ConfigNothing, NoSave
 from enigma import eAVSwitch, getDesktop
 from SystemInfo import SystemInfo
 from os import path as os_path
@@ -73,8 +73,8 @@ def InitAVSwitch():
        # when YUV is not enabled, don't let the user select it
        if config.av.yuvenabled.value:
                colorformat_choices["yuv"] = _("YPbPr")
-
-       config.av.colorformat = ConfigSelection(choices=colorformat_choices, default="rgb")
+#      ikseong
+       config.av.colorformat = ConfigSelection(choices=colorformat_choices, default="cvbs")
        config.av.aspectratio = ConfigSelection(choices={
                        "4_3_letterbox": _("4:3 Letterbox"),
                        "4_3_panscan": _("4:3 PanScan"), 
@@ -112,8 +112,8 @@ def InitAVSwitch():
        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.generalAC3delay = ConfigSelectionNumber(-1000, 1000, 25, default = 0)
+       config.av.generalPCMdelay = ConfigSelectionNumber(-1000, 1000, 25, default = 0)
        config.av.vcrswitch = ConfigEnableDisable(default = False)
 
        iAVSwitch = AVSwitch()
@@ -155,6 +155,18 @@ def InitAVSwitch():
                config.av.downmix_ac3.addNotifier(setAC3Downmix)
 
        try:
+               can_downmix_aac = open("/proc/stb/audio/aac_choices", "r").read()[:-1].find("downmix") != -1
+       except:
+               can_downmix_aac = False
+
+       SystemInfo["CanDownmixAAC"] = can_downmix_aac
+       if can_downmix_aac:
+               def setAACDownmix(configElement):
+                       open("/proc/stb/audio/aac", "w").write(configElement.value and "downmix" or "passthrough")
+               config.av.downmix_aac = ConfigYesNo(default = True)
+               config.av.downmix_aac.addNotifier(setAACDownmix)
+
+       try:
                can_osd_alpha = open("/proc/stb/video/alpha", "r") and True or False
        except:
                can_osd_alpha = False