comment out ac3 default option until it is implemented

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

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index b4090c195a63ed74b057a120c24e5d99607868a7..525ecb969d67bb188a253148fa1fac1742fb502d 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -9,8 +9,8 @@ class AVSwitch:
                eAVSwitch.getInstance().setInput(self.INPUT[input][0])
                if self.INPUT[input][1] == 4:
                        aspect = self.getAspectRatioSetting()
-                       self.setWSS(aspect)
-                       self.setSlowBlank(aspect)
+                       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?
@@ -21,8 +21,8 @@ class AVSwitch:
 
        def setAspectRatio(self, value):
                eAVSwitch.getInstance().setAspectRatio(value)
-               self.setWSS(value)
-               self.setSlowBlank(value)
+               self.setAspectWSS(value)
+               self.setAspectSlowBlank(value)
 
        def setSystem(self, value):
                eAVSwitch.getInstance().setVideomode(value)
@@ -37,9 +37,13 @@ class AVSwitch:
                        val = 2
                elif valstr == "16_9_always":
                        val = 3
+               elif valstr == "16_10_letterbox":
+                       val = 4
+               elif valstr == "16_10_panscan":
+                       val = 5
                return val
 
-       def setWSS(self, aspect=None):
+       def setAspectWSS(self, aspect=None):
                if aspect is None:
                        aspect = self.getAspectRatioSetting()
                if aspect == 0 or aspect == 1: # letterbox or panscan
@@ -51,27 +55,36 @@ class AVSwitch:
                                value = 1 # auto
                elif aspect == 3: # always 16:9
                        value = 4 # 16:9_full_format
+               elif aspect == 4 or aspect == 5: # 16:10
+                       value = 10 # 14:9_full_format
                eAVSwitch.getInstance().setWSS(value)
 
-       def setSlowBlank(self, aspect=None):
+       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: # always 16:9
+               elif aspect == 3 or aspect == 4 or aspect == 5: # always 16:9
                        value = 1 # 6V
                eAVSwitch.getInstance().setSlowblank(value)
 
 def InitAVSwitch():
        config.av = ConfigSubsection();
-       config.av.colorformat = configElement("config.av.colorformat", configSelection, 1, (("cvbs", _("CVBS")), ("rgb", _("RGB")), ("svideo", _("S-Video")) ))
-       config.av.aspectratio = configElement("config.av.aspectratio", configSelection, 0, (("4_3_letterbox", _("4:3 Letterbox")), ("4_3_panscan", _("4:3 PanScan")), ("16_9", _("16:9")), ("16_9_always", _("16:9 always"))) )
+       config.av.yuvenabled = configElementBoolean("config.av.yuvenabled", 0)
+       colorformat_choices = ( ("cvbs", _("CVBS")), ("rgb", _("RGB")), ("svideo", _("S-Video")), ("yuv", _("YPbPr")) )
+       
+       # when YUV is not enabled, don't let the user select it
+       if not config.av.yuvenabled.value:
+               colorformat_choices = colorformat_choices[:3]
+
+       config.av.colorformat = configElement("config.av.colorformat", configSelection, 1, colorformat_choices)
+       config.av.aspectratio = configElement("config.av.aspectratio", configSelection, 0, (("4_3_letterbox", _("4:3 Letterbox")), ("4_3_panscan", _("4:3 PanScan")), ("16_9", _("16:9")), ("16_9_always", _("16:9 always")), ("16_10_letterbox", _("16:10 Letterbox")), ("16_10_panscan", _("16:10 PanScan"))) )
        #config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, ("PAL", "PAL + PAL60", "Multi", "NTSC") )
        config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, (("pal", _("PAL")), ("ntsc", _("NTSC"))) )
        config.av.wss = configElement("config.av.wss", configSelection, 0, (("off", _("Off")), ("on", _("On"))) )
-       config.av.defaultac3 = configElement("config.av.defaultac3", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))))
+#      config.av.defaultac3 = configElement("config.av.defaultac3", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))))
        config.av.vcrswitch = configElement("config.av.vcrswitch", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))))
 
        iAVSwitch = AVSwitch()
@@ -86,7 +99,7 @@ def InitAVSwitch():
                iAVSwitch.setSystem(configElement.value)
 
        def setWSS(configElement):
-               iAVSwitch.setWSS(configElement.value)
+               iAVSwitch.setAspectWSS()
 
        # this will call the "setup-val" initial
        config.av.colorformat.addNotifier(setColorFormat)
@@ -94,4 +107,4 @@ def InitAVSwitch():
        config.av.tvsystem.addNotifier(setSystem)
        config.av.wss.addNotifier(setWSS)
 
-       iAVSwitch.setInput("ENCODER") # init on startup
\ No newline at end of file
+       iAVSwitch.setInput("ENCODER") # init on startup