SystemPlugins/Videomode: show HDMI on DM500HD instead of DVI
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 5 Aug 2009 16:10:36 +0000 (18:10 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 5 Aug 2009 16:10:36 +0000 (18:10 +0200)
lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py

index 71529a0..adc63d2 100644 (file)
@@ -2,6 +2,7 @@ from enigma import eTimer
 from Components.config import config, ConfigSelection, ConfigSubDict, ConfigYesNo
 
 from Tools.CList import CList
 from Components.config import config, ConfigSelection, ConfigSubDict, ConfigYesNo
 
 from Tools.CList import CList
+from Tools.HardwareInfo import HardwareInfo
 
 # The "VideoHardware" is the interface to /proc/stb/video.
 # It generates hotplug events, and gives you the list of 
 
 # The "VideoHardware" is the interface to /proc/stb/video.
 # It generates hotplug events, and gives you the list of 
@@ -228,20 +229,27 @@ class VideoHardware:
                return res
 
        def createConfig(self, *args):
                return res
 
        def createConfig(self, *args):
-               # create list of output ports
-               portlist = self.getPortList()
+               hw_type = HardwareInfo().get_device_name()
+               lst = []
 
 
-               # create list of available modes
-               config.av.videoport = ConfigSelection(choices = [(port, _(port)) for port in portlist])
                config.av.videomode = ConfigSubDict()
                config.av.videorate = ConfigSubDict()
 
                config.av.videomode = ConfigSubDict()
                config.av.videorate = ConfigSubDict()
 
+               # create list of output ports
+               portlist = self.getPortList()
                for port in portlist:
                for port in portlist:
+                       descr = port
+                       if descr == 'DVI' and hw_type == 'dm500hd':
+                               descr = 'HDMI'
+                       lst.append((port, descr))
+
+                       # create list of available modes
                        modes = self.getModeList(port)
                        if len(modes):
                                config.av.videomode[port] = ConfigSelection(choices = [mode for (mode, rates) in modes])
                        for (mode, rates) in modes:
                                config.av.videorate[mode] = ConfigSelection(choices = rates)
                        modes = self.getModeList(port)
                        if len(modes):
                                config.av.videomode[port] = ConfigSelection(choices = [mode for (mode, rates) in modes])
                        for (mode, rates) in modes:
                                config.av.videorate[mode] = ConfigSelection(choices = rates)
+               config.av.videoport = ConfigSelection(choices = lst)
 
        def setConfiguredMode(self):
                port = config.av.videoport.value
 
        def setConfiguredMode(self):
                port = config.av.videoport.value
index 8f8bea0..bceb6bc 100644 (file)
@@ -7,6 +7,7 @@ from Components.Pixmap import Pixmap, MovingPixmap, MultiPixmap
 from Components.config import config, ConfigBoolean, configfile
 
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 from Components.config import config, ConfigBoolean, configfile
 
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
+from Tools.HardwareInfo import HardwareInfo
 
 config.misc.showtestcard = ConfigBoolean(default = False)
 
 
 config.misc.showtestcard = ConfigBoolean(default = False)
 
@@ -75,11 +76,15 @@ class VideoWizard(WizardLanguage, Rc):
                configfile.save()
        
        def listInputChannels(self):
                configfile.save()
        
        def listInputChannels(self):
+               hw_type = HardwareInfo().get_device_name()
                list = []
 
                for port in self.hw.getPortList():
                        if self.hw.isPortUsed(port):
                list = []
 
                for port in self.hw.getPortList():
                        if self.hw.isPortUsed(port):
-                               list.append((port,port))
+                               descr = port
+                               if descr == 'DVI' and hw_type == 'dm500hd':
+                                       descr = 'HDMI'
+                               list.append((descr,port))
                list.sort(key = lambda x: x[0])
                print "listInputChannels:", list
                return list
                list.sort(key = lambda x: x[0])
                print "listInputChannels:", list
                return list