show scaler sharpness in av setup and in video enhancement plugin

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 8f4255b817c099178f8eeb7cdb8fc3cfe5d8c073..bc2a66a4947f2384999f93d10a4b8567d22b1ab4 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,7 +1,8 @@
 from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, \
-       ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigNumber
+       ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigNumber, ConfigNothing, NoSave
 from enigma import eAVSwitch, getDesktop
 from SystemInfo import SystemInfo
+from os import path as os_path
 
 class AVSwitch:
        def setInput(self, input):
@@ -166,3 +167,19 @@ def InitAVSwitch():
        if can_osd_alpha:
                config.av.osd_alpha = ConfigSlider(default=255, limits=(0,255))
                config.av.osd_alpha.addNotifier(setAlpha)
+
+       if os_path.exists("/proc/stb/vmpeg/0/pep_scaler_sharpness"):
+               def setScaler_sharpness(config):
+                       myval = int(config.value)
+                       try:
+                               print "--> setting scaler_sharpness to: %0.8X" % myval
+                               open("/proc/stb/vmpeg/0/pep_scaler_sharpness", "w").write("%0.8X" % myval)
+                               open("/proc/stb/vmpeg/0/pep_apply", "w").write("1")
+                       except IOError:
+                               print "couldn't write pep_scaler_sharpness"
+
+               config.av.scaler_sharpness = ConfigSlider(default=13, limits=(0,26))
+               config.av.scaler_sharpness.addNotifier(setScaler_sharpness)
+       else:
+               config.av.scaler_sharpness = NoSave(ConfigNothing())
+

diff --git a/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py b/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py
index 3fbef7c2094a83a046836817a0071e65c129f7fd..b18f5595e4375a1292147e846fcf41282ba1ea0a 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py
+++ b/lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py
@@ -133,23 +133,6 @@ class VideoEnhancement:
                else:
                        config.pep.digital_contour_removal = NoSave(ConfigNothing())
 
-               if os_path.exists("/proc/stb/vmpeg/0/pep_scaler_sharpness"):
-                       def setScaler_sharpness(config):
-                               myval = int(config.value)
-                               try:
-                                       print "--> setting scaler_sharpness to: %0.8X" % myval
-                                       open("/proc/stb/vmpeg/0/pep_scaler_sharpness", "w").write("%0.8X" % myval)
-                               except IOError:
-                                       print "couldn't write pep_scaler_sharpness"
-
-                               if not VideoEnhancement.firstRun:
-                                       self.setConfiguredValues()
-
-                       config.pep.scaler_sharpness = ConfigSlider(default=13, limits=(0,26))
-                       config.pep.scaler_sharpness.addNotifier(setScaler_sharpness)
-               else:
-                       config.pep.scaler_sharpness = NoSave(ConfigNothing())
-
                if os_path.exists("/proc/stb/vmpeg/0/pep_split"):
                        def setSplitMode(config):
                                try:

diff --git a/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py b/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
index e25ad38e44eaaed77151a2749f504f64de281710..0276e04b7385c95e5998aa8ad796e129a4262a5a 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
@@ -65,7 +65,7 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                self.oldBlock_noise = config.pep.block_noise_reduction.value
                self.oldMosquito_noise = config.pep.mosquito_noise_reduction.value
                self.oldDigital_contour = config.pep.digital_contour_removal.value
-               self.oldScaler_sharpness = config.pep.scaler_sharpness.value
+               self.oldScaler_sharpness = config.av.scaler_sharpness.value
                self.oldSplit = config.pep.split.value
                self.oldSharpness = config.pep.sharpness.value
                self.oldAuto_flesh = config.pep.auto_flesh.value
@@ -90,7 +90,7 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                self.saturationEntry = addToConfigList(_("Saturation"), config.pep.saturation)
                self.hueEntry = addToConfigList(_("Hue"), config.pep.hue)
                self.brightnessEntry = addToConfigList(_("Brightness"), config.pep.brightness)
-               self.scaler_sharpnessEntry = addToConfigList(_("Scaler sharpness"), config.pep.scaler_sharpness)
+               self.scaler_sharpnessEntry = addToConfigList(_("Scaler sharpness"), config.av.scaler_sharpness)
                self.splitEntry = addToConfigList(_("Split preview mode"), config.pep.split, True)
                add_to_xtdlist = self.splitEntry is not None
                self.sharpnessEntry = addToConfigList(_("Sharpness"), config.pep.sharpness, add_to_xtdlist)
@@ -194,7 +194,7 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                        if self.digital_contour_removalEntry is not None:
                                config.pep.digital_contour_removal.setValue(self.oldDigital_contour)
                        if self.scaler_sharpnessEntry is not None:
-                               config.pep.scaler_sharpness.setValue(self.oldScaler_sharpness)
+                               config.av.scaler_sharpness.setValue(self.oldScaler_sharpness)
                        if self.splitEntry is not None:
                                config.pep.split.setValue('off')
                        if self.sharpnessEntry is not None:
@@ -231,7 +231,7 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                        if self.digital_contour_removalEntry is not None:
                                config.pep.digital_contour_removal.setValue(0)
                        if self.scaler_sharpnessEntry is not None:
-                               config.pep.scaler_sharpness.setValue(13)
+                               config.av.scaler_sharpness.setValue(13)
                        if self.splitEntry is not None:
                                config.pep.split.setValue('off')
                        if self.sharpnessEntry is not None:

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/plugin.py b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
index 7a2127ac97cc54be8aeb3c25c29193560cef2ba5..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
 
@@ -106,6 +106,9 @@ class VideoSetup(Screen, ConfigListScreen):
                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)