Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / python / Plugins / SystemPlugins / Videomode / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
index 5a7dfd1b61ef5c3506f2d67994a3c73f1f4b4d0b..1b820fb1e975c5dcb089bcad85b1163531c30362 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
@@ -2,7 +2,7 @@ from Screens.Screen import Screen
 from Plugins.Plugin import PluginDescriptor
 from Components.SystemInfo import SystemInfo
 from Components.ConfigList import ConfigListScreen
-from Components.config import getConfigListEntry, config, ConfigBoolean
+from Components.config import getConfigListEntry, config, ConfigBoolean, ConfigNothing, ConfigSlider
 
 from VideoHardware import video_hw
 
@@ -98,10 +98,17 @@ class VideoSetup(Screen, ConfigListScreen):
                        self.list.append(getConfigListEntry(_("AC3 default"), config.av.defaultac3))
                        if SystemInfo["CanDownmixAC3"]:
                                self.list.append(getConfigListEntry(_("AC3 downmix"), config.av.downmix_ac3))
+                       self.list.extend((
+                               getConfigListEntry(_("General AC3 Delay"), config.av.generalAC3delay),
+                               getConfigListEntry(_("General PCM Delay"), config.av.generalPCMdelay)
+                       ))
 
                if SystemInfo["CanChangeOsdAlpha"]:
                        self.list.append(getConfigListEntry(_("OSD visibility"), config.av.osd_alpha))
 
+               if not isinstance(config.av.scaler_sharpness, ConfigNothing):
+                       self.list.append(getConfigListEntry(_("Scaler sharpness"), config.av.scaler_sharpness))
+
                self["config"].list = self.list
                self["config"].l.setList(self.list)
 
@@ -135,7 +142,7 @@ class VideoSetup(Screen, ConfigListScreen):
                if (port, mode, rate) != self.last_good:
                        self.hw.setMode(port, mode, rate)
                        from Screens.MessageBox import MessageBox
-                       self.session.openWithCallback(self.confirm, MessageBox, "Is this videomode ok?", MessageBox.TYPE_YESNO, timeout = 20, default = False)
+                       self.session.openWithCallback(self.confirm, MessageBox, _("Is this videomode ok?"), MessageBox.TYPE_YESNO, timeout = 20, default = False)
                else:
                        self.keySave()