fix when booting in scart mode (preferred modes will be empty)

[enigma2.git] / lib / python / Plugins / SystemPlugins / Videomode / VideoHardware.py

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index 9a58403a3f8de9f3205b2a03d6e556f7de8f6f83..701daaf271b1039e7a587be48e8f6138ffc74f27 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -50,16 +50,19 @@ class VideoHardware:
        }
 
        modes["Scart"] = ["PAL", "NTSC", "Multi"]
-       modes["YPrPb"] = ["720p", "1080i"]
+       modes["YPbPr"] = ["720p", "1080i"]
        modes["DVI"] = ["720p", "1080i", "PC"]
 
        def __init__(self):
                self.last_modes_preferred =  [ ]
                self.on_hotplug = CList()
 
-               self.on_hotplug.append(self.createConfig)
 
                self.readAvailableModes()
+
+               self.createConfig()
+#              self.on_hotplug.append(self.createConfig)
+
                self.readPreferredModes()
 
                # until we have the hotplug poll socket
@@ -91,7 +94,6 @@ class VideoHardware:
 
        # check if a high-level mode with a given rate is available.
        def isModeAvailable(self, port, mode, rate):
-               print "isModeAvailable:", port, mode, rate, 
                rate = self.rates[mode][rate]
                for mode in rate.values():
                        # DVI modes must be in "modes_preferred"
@@ -100,9 +102,7 @@ class VideoHardware:
 #                                      print "no, not preferred"
 #                                      return False
                        if mode not in self.modes_available:
-                               print "no, not available"
                                return False
-               print "yes"
                return True
 
        def setMode(self, port, mode, rate, force = None):
@@ -131,6 +131,13 @@ class VideoHardware:
                # fixme
                return True
 
+       def isPortUsed(self, port):
+               if port == "DVI":
+                       self.readPreferredModes()
+                       return len(self.modes_preferred) != 0
+               else:
+                       return True
+
        def getPortList(self):
                return [port for port in self.modes if self.isPortAvailable(port)]