fix inverted setting (meaning was inverted too)

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

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index b42d74c2b93a3c68d6e50bccc19205c1ded2e431..b36dc4a282706e78c67100a081daf45a733b5748 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,50 +1,72 @@
 from config import *
 import os
 from config import *
 import os

+from enigma import *

 
 class AVSwitch:
 
 class AVSwitch:

+       INPUT = { "ENCODER": 0, "SCART": 1, "AUX": 2 }

        def __init__(self):
                pass
 
        def setColorFormat(self, value):
        def __init__(self):
                pass
 
        def setColorFormat(self, value):

-               print "colorformat:" + str(value)
-               os.system("scart " + str(value))
+               eAVSwitch.getInstance().setColorFormat(value)

                
        def setAspectRatio(self, value):
                
        def setAspectRatio(self, value):

-               print "aspectratio:" + str(value)
+               eAVSwitch.getInstance().setAspectRatio(value)
+               self.checkWSS()

 
        def setSystem(self, value):
 
        def setSystem(self, value):

-               print "system:" + str(value)
+               eAVSwitch.getInstance().setVideomode(value)
+               
+       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):
-               print "wss:" + str(value)
+       def setWSS(self, value = None):
+               self.checkWSS()
+       
+       def setInput(self, input):
+               eAVSwitch.getInstance().setInput(self.INPUT[input])
+               # FIXME why do we have to reset the colorformat? bug in avs-driver?
+               eAVSwitch.getInstance().setColorFormat(config.av.colorformat.value)

 
 def InitAVSwitch():
        config.av = ConfigSubsection();
 
 def InitAVSwitch():
        config.av = ConfigSubsection();

-       config.av.colorformat = configElement("config.av.colorformat", configBoolean, 1, ("CVBS", "RGB", "S-Video") );
-       config.av.aspectratio = configElement("config.av.aspectratio", configBoolean, 0, ("4:3 Letterbox", "4:3 PanScan", "16:9", "16:9 always") );
-       config.av.tvsystem = configElement("config.av.tvsystem", configBoolean, 0, ("PAL", "PAL + PAL60", "Multi", "NTSC") );
-       config.av.wss = configElement("config.av.wss", configBoolean, 0, ("Enable", "Disable") );
-       config.av.defaultac3 = configElement("config.av.defaultac3", configBoolean, 1, ("Enable", "Disable") );
-       config.av.vcrswitch = configElement("config.av.vcrswitch", configBoolean, 0, ("Enable", "Disable") );
+       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.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.vcrswitch = configElement("config.av.vcrswitch", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))))

 
        iAVSwitch = AVSwitch()
 
        def setColorFormat(configElement):
 
        iAVSwitch = AVSwitch()
 
        def setColorFormat(configElement):

-               iAVSwitch.setColorFormat(configElement.value);
+               iAVSwitch.setColorFormat(configElement.value)

        def setAspectRatio(configElement):
        def setAspectRatio(configElement):

-               iAVSwitch.setAspectRatio(configElement.value);
+               iAVSwitch.setAspectRatio(configElement.value)

        def setSystem(configElement):
        def setSystem(configElement):

-               iAVSwitch.setSystem(configElement.value);
+               iAVSwitch.setSystem(configElement.value)

        def setWSS(configElement):
        def setWSS(configElement):

-               iAVSwitch.setWSS(configElement.value);
+               iAVSwitch.setWSS(configElement.value)

 
        # this will call the "setup-val" initial
 
        # this will call the "setup-val" initial

-       config.av.colorformat.addNotifier(setColorFormat);
-       config.av.aspectratio.addNotifier(setAspectRatio);
-       config.av.tvsystem.addNotifier(setSystem);
-       config.av.wss.addNotifier(setWSS);
-
-
-       config.save()
+       config.av.colorformat.addNotifier(setColorFormat)
+       config.av.aspectratio.addNotifier(setAspectRatio)
+       config.av.tvsystem.addNotifier(setSystem)
+       config.av.wss.addNotifier(setWSS)

        
        

-
+       iAVSwitch.setInput("ENCODER") # init on startup
\ No newline at end of file