lib/python/Components/VolumeControl.py: make the VolumeControl instance global access...

[enigma2.git] / lib / python / Components / AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 7ac2bb98081a7555d1f5cca2a868aca9a4e1900b..2658f9ba532c4c593de84bc060de371aa79daecb 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,47 +1,44 @@
-from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
-from enigma import eAVSwitch
+from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, \
+       ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigSelectionNumber, ConfigNothing, NoSave
+from enigma import eAVSwitch, getDesktop

 from SystemInfo import SystemInfo
 from SystemInfo import SystemInfo

+from os import path as os_path

 
 class AVSwitch:
 
 class AVSwitch:

-       INPUT = { "ENCODER": (0, 4), "SCART": (1, 3), "AUX": (2, 4) }
-

        def setInput(self, input):
        def setInput(self, input):

-               eAVSwitch.getInstance().setInput(self.INPUT[input][0])
-               if self.INPUT[input][1] == 4:
-                       aspect = self.getAspectRatioSetting()
-                       self.setAspectWSS(aspect)
-                       self.setAspectSlowBlank(aspect)
-               else:
-                       eAVSwitch.getInstance().setSlowblank(self.INPUT[input][1])
-               # FIXME why do we have to reset the colorformat? bug in avs-driver?
-               map = {"cvbs": 0, "rgb": 1, "svideo": 2, "yuv": 3}
-               eAVSwitch.getInstance().setColorFormat(map[config.av.colorformat.value])
+               INPUT = { "ENCODER": 0, "SCART": 1, "AUX": 2 }
+               eAVSwitch.getInstance().setInput(INPUT[input])

 
        def setColorFormat(self, value):
                eAVSwitch.getInstance().setColorFormat(value)
 
        def setAspectRatio(self, value):
                eAVSwitch.getInstance().setAspectRatio(value)
 
        def setColorFormat(self, value):
                eAVSwitch.getInstance().setColorFormat(value)
 
        def setAspectRatio(self, value):
                eAVSwitch.getInstance().setAspectRatio(value)

-               self.setAspectWSS(value)
-               self.setAspectSlowBlank(value)

 
        def setSystem(self, value):
                eAVSwitch.getInstance().setVideomode(value)
 
        def getOutputAspect(self):
 
        def setSystem(self, value):
                eAVSwitch.getInstance().setVideomode(value)
 
        def getOutputAspect(self):

+               valstr = config.av.aspectratio.value

                if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3
                if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3

-                       return 1.333333333
+                       return (4,3)

                elif valstr == "16_9": # auto ... 4:3 or 16:9
                elif valstr == "16_9": # auto ... 4:3 or 16:9

-                       # TODO: here we must retrieve the current video aspect ratio...
-                       # because the TV can run in 4:3 or in 16:9 mode.. (switched by wss or scart pin8)
-                       # until we have done this we always return the scale value for 16:9!!
-                       return 1.777777778
+                       try:
+                               aspect_str = open("/proc/stb/vmpeg/0/aspect", "r").read()
+                               if aspect_str == "1": # 4:3
+                                       return (4,3)
+                       except IOError:
+                               pass

                elif valstr in ("16_9_always", "16_9_letterbox"): # 16:9
                elif valstr in ("16_9_always", "16_9_letterbox"): # 16:9

-                       return 1.777777778
+                       pass

                elif valstr in ("16_10_letterbox", "16_10_panscan"): # 16:10
                elif valstr in ("16_10_letterbox", "16_10_panscan"): # 16:10

-                       return 1.6
-               print "unknown output aspect!"
-               return 1.0000
+                       return (16,10)
+               return (16,9)
+
+       def getFramebufferScale(self):
+               aspect = self.getOutputAspect()
+               fb_size = getDesktop(0).size()
+               return (aspect[0] * fb_size.height(), aspect[1] * fb_size.width())

 
        def getAspectRatioSetting(self):
                valstr = config.av.aspectratio.value
 
        def getAspectRatioSetting(self):
                valstr = config.av.aspectratio.value


@@ -62,35 +59,12 @@ class AVSwitch:
                return val
 
        def setAspectWSS(self, aspect=None):
                return val
 
        def setAspectWSS(self, aspect=None):

-               if aspect is None:
-                       aspect = self.getAspectRatioSetting()
-               if aspect == 0 or aspect == 1: # letterbox or panscan
-                       if not config.av.wss.value:
-                               value = 0 # wss off
-                       else:
-                               value = 3 # 4:3_full_format
-               elif aspect == 2: # 16:9
-                       if not config.av.wss.value:
-                               value = 2 # auto(4:3_off)
-                       else:
-                               value = 1 # auto
-               elif aspect == 3 or aspect == 6: # always 16:9
-                       value = 4 # 16:9_full_format
-               elif aspect == 4 or aspect == 5: # 16:10
-                       value = 10 # 14:9_full_format
+               if not config.av.wss.value:
+                       value = 2 # auto(4:3_off)
+               else:
+                       value = 1 # auto

                eAVSwitch.getInstance().setWSS(value)
 
                eAVSwitch.getInstance().setWSS(value)
 

-       def setAspectSlowBlank(self, aspect=None):
-               if aspect is None:
-                       aspect = self.getAspectRatioSetting()
-               if aspect == 0 or aspect == 1: # letterbox or panscan
-                       value = 2 # 12 V
-               elif aspect == 2: # 16:9
-                       value = 4 # auto
-               elif aspect == 3 or aspect == 4 or aspect == 5 or aspect == 6: # always 16:9
-                       value = 1 # 6V
-               eAVSwitch.getInstance().setSlowblank(value)
-

 def InitAVSwitch():
        config.av = ConfigSubsection()
        config.av.yuvenabled = ConfigBoolean(default=False)
 def InitAVSwitch():
        config.av = ConfigSubsection()
        config.av.yuvenabled = ConfigBoolean(default=False)


@@ -138,6 +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.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 = ConfigSelectionNumber(-1000, 1000, 25, default = 0)
+       config.av.generalPCMdelay = ConfigSelectionNumber(-1000, 1000, 25, default = 0)

        config.av.vcrswitch = ConfigEnableDisable(default = False)
 
        iAVSwitch = AVSwitch()
        config.av.vcrswitch = ConfigEnableDisable(default = False)
 
        iAVSwitch = AVSwitch()


@@ -191,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 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())
+