better wss setup

diff --git a/data/setup.xml b/data/setup.xml
index 7fe595d..314c17b 100644 (file)
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -11,7 +11,7 @@
                        <item text="Color Format">config.av.colorformat</item>
                        <item text="Aspect Ratio">config.av.aspectratio</item>
                        <item text="TV System">config.av.tvsystem</item>
-                       <item text="WSS">config.av.wss</item>
+                       <item text="WSS on 4:3">config.av.wss</item>
                        <item text="AC3 default">config.av.defaultac3</item>
                        <item text="VCR Switch">config.av.vcrswitch</item>
                </setup>

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 0b285cf..d74ad25 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -12,23 +12,30 @@ class AVSwitch:
                
        def setAspectRatio(self, value):
                eAVSwitch.getInstance().setAspectRatio(value)
+               self.checkWSS()
 
        def setSystem(self, value):
                eAVSwitch.getInstance().setVideomode(value)
-
-       def setWSS(self, value):
-               if currentConfigSelectionElement(config.av.wss) == "off":
-                       writevalue = "off"
-               elif currentConfigSelectionElement(config.av.wss) == "auto":
-                       writevalue = "auto"
-               elif currentConfigSelectionElement(config.av.wss) == "auto_no4_3":
-                       writevalue = "auto(4:3_off)"
+               
+       def checkWSS(self):
+               if currentConfigSelectionElement(config.av.aspectratio) == "4_3_letterbox" or currentConfigSelectionElement(config.av.aspectratio) == "4_3_panscan":
+                       writevalue = "4:3_full_format"
+               elif currentConfigSelectionElement(config.av.aspectratio) == "16_9":
+                       if currentConfigSelectionElement(config.av.wss) == "off":
+                               writevalue = "auto(4:3_off)"
+                       else:
+                               writevalue = "auto"
+               elif currentConfigSelectionElement(config.av.aspectratio) == "16_9_always":
+                       writevalue = "16:9_full_format"
                try:
                        file = open("/proc/stb/denc/0/wss", "w")
                        file.write(writevalue)
                        file.close()
                except:
                        print "[AVSwitch.py] Error writing to /proc/stb/denc/0/wss"
+
+       def setWSS(self, value = None):
+               self.checkWSS()
        
        def setInput(self, input):
                eAVSwitch.getInstance().setInput(self.INPUT[input])
@@ -41,7 +48,7 @@ def InitAVSwitch():
        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.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")), ("auto", _("Auto")), ("auto_no4_3", _("Auto (disable on 4:3)"))) )
+       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.vcrswitch = configElement("config.av.vcrswitch", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))))