configSelection is now saved to config file in a human readable style

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

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 536bfc959f3534b67295a7543c282f9c4f2d56a0..22d24dfc9786b4c2dc81550d8440a92d2302c978 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -3,15 +3,14 @@ import os
 from enigma import *
 
 class AVSwitch:
+       INPUT = { "ENCODER": 0, "SCART": 1, "AUX": 2 }
        def __init__(self):
                pass
 
        def setColorFormat(self, value):
-               #print "colorformat:" + str(value)
                eAVSwitch.getInstance().setColorFormat(value)
                
        def setAspectRatio(self, value):
-               #print "aspectratio:" + str(value)
                eAVSwitch.getInstance().setAspectRatio(value)
 
        def setSystem(self, value):
@@ -21,15 +20,19 @@ class AVSwitch:
        def setWSS(self, value):
                #print "wss:" + str(value)
                pass
+       
+       def setInput(self, input):
+               eAVSwitch.getInstance().setInput(self.INPUT[input])
 
 def InitAVSwitch():
        config.av = ConfigSubsection();
-       config.av.colorformat = configElement("config.av.colorformat", configSelection, 1, ("CVBS", "RGB", "S-Video") );
-       config.av.aspectratio = configElement("config.av.aspectratio", configSelection, 0, ("4:3 Letterbox", "4:3 PanScan", "16:9", "16:9 always") );
-       config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, ("PAL", "PAL + PAL60", "Multi", "NTSC") );
-       config.av.wss = configElement("config.av.wss", configSelection, 0, ("Enable", "Disable") );
-       config.av.defaultac3 = configElement("config.av.defaultac3", configSelection, 1, ("Enable", "Disable") );
-       config.av.vcrswitch = configElement("config.av.vcrswitch", configSelection, 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, (("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()
 
@@ -47,4 +50,5 @@ def InitAVSwitch():
        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