fix automatic scan

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

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 739b6cd0740c9cd7519f0f5d7aaf7072e82cdee5..768b08e948cdd5d3187544043b599c54063a66b4 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,31 +1,34 @@
 from config import *
 import os
+from enigma import *
 
 class AVSwitch:
        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):
-               print "aspectratio:" + str(value)
+               eAVSwitch.getInstance().setAspectRatio(value)
 
        def setSystem(self, value):
                print "system:" + str(value)
+               eAVSwitch.getInstance().setVideomode(value)
 
        def setWSS(self, value):
-               print "wss:" + str(value)
+               #print "wss:" + str(value)
+               pass
 
 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", "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.tvsystem = configElement("config.av.tvsystem", configSelection, 0, ("PAL", "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, 1, ("Enable", "Disable") );
 
        iAVSwitch = AVSwitch()