X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2f2b96fef51a5b4bfeb599f9785ecb6315c1fd4d..f73d0bc413f59410c44b82437ec8b705a2f9ce76:/lib/python/Components/AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 044ea43c..39c3abe1 100644
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -111,7 +111,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,7 +119,7 @@ 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)
@@ -151,3 +151,14 @@ def InitAVSwitch():
 	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)