A/V settings : update.

 - add "AAC downmix" setup
 - fix entry name, Dolby Digital downmix -> Donly Digital / DTS downmix

diff --git a/data/setup.xml b/data/setup.xml
index ef0f1bc..d040545 100755 (executable)
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -15,7 +15,8 @@
                        <item level="1" text="Dolby Digital default">config.av.defaultac3</item>
                        <item level="1" text="General Dolby Digital delay (ms)">config.av.generalAC3delay</item>
                        <item level="1" text="General PCM delay (ms)">config.av.generalPCMdelay</item>
                        <item level="1" text="Dolby Digital default">config.av.defaultac3</item>
                        <item level="1" text="General Dolby Digital delay (ms)">config.av.generalAC3delay</item>
                        <item level="1" text="General PCM delay (ms)">config.av.generalPCMdelay</item>

-                       <item level="1" text="Dolby Digital downmix" requires="CanDownmixAC3">config.av.downmix_ac3</item>
+                       <item level="1" text="Dolby Digital / DTS downmix" requires="CanDownmixAC3">config.av.downmix_ac3</item>
+                       <item level="1" text="AAC downmix" requires="CanDownmixAAC">config.av.downmix_aac</item>

                        <item level="1" text="Auto scart switching" requires="ScartSwitch">config.av.vcrswitch</item>
                </setup>
                <setup key="usage" title="Customize">
                        <item level="1" text="Auto scart switching" requires="ScartSwitch">config.av.vcrswitch</item>
                </setup>
                <setup key="usage" title="Customize">

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 37d47f3..b5f6b1f 100755 (executable)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -155,6 +155,18 @@ def InitAVSwitch():
                config.av.downmix_ac3.addNotifier(setAC3Downmix)
 
        try:
                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
                can_osd_alpha = open("/proc/stb/video/alpha", "r") and True or False
        except:
                can_osd_alpha = False

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
old mode 100644 (file)
new mode 100755 (executable)
index 74cec11..a13ef28
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -22,7 +22,8 @@ class avSetupScreen(ConfigListScreen, Screen):
                {"idx":8, "level":1, "text":"WSS on 4:3", "item":config.av.wss},
                {"idx":9, "level":1, "text":"Auto scart switching", "requires":"ScartSwitch", "item":config.av.vcrswitch},
                {"idx":0, "level":1, "text":"Dolby Digital default", "item":config.av.defaultac3},
                {"idx":8, "level":1, "text":"WSS on 4:3", "item":config.av.wss},
                {"idx":9, "level":1, "text":"Auto scart switching", "requires":"ScartSwitch", "item":config.av.vcrswitch},
                {"idx":0, "level":1, "text":"Dolby Digital default", "item":config.av.defaultac3},

-               {"idx":0, "level":1, "text":"Dolby Digital downmix", "requires":"CanDownmixAC3", "item":config.av.downmix_ac3},
+               {"idx":0, "level":1, "text":"Dolby Digital / DTS downmix", "requires":"CanDownmixAC3", "item":config.av.downmix_ac3},
+               {"idx":0, "level":1, "text":"AAC downmix", "requires":"CanDownmixAAC", "item":config.av.downmix_aac},

                {"idx":0, "level":1, "text":"General Dolby Digital delay(ms)", "item":config.av.generalAC3delay},
                {"idx":0, "level":1, "text":"General PCM delay(ms)", "item":config.av.generalPCMdelay},
                {"idx":0, "level":0, "text":"OSD visibility", "requires":"CanChangeOsdAlpha", "item":config.av.osd_alpha},
                {"idx":0, "level":1, "text":"General Dolby Digital delay(ms)", "item":config.av.generalAC3delay},
                {"idx":0, "level":1, "text":"General PCM delay(ms)", "item":config.av.generalPCMdelay},
                {"idx":0, "level":0, "text":"OSD visibility", "requires":"CanChangeOsdAlpha", "item":config.av.osd_alpha},