projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm800se support
[vuplus_dvbapp]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
Videomode
/
VideoWizard.py
diff --git
a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index
095e94c
..
3c76685
100644
(file)
--- a/
lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/
lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@
-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,16
@@
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 in ('dm500hd', 'dm800se'):
+ descr = 'HDMI'
+ if port != "DVI-PC":
+ 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
@@
-93,15
+99,19
@@
class VideoWizard(WizardLanguage, Rc):
print "input selection moved:", self.selection
self.inputSelect(self.selection)
if self["portpic"].instance is not None:
print "input selection moved:", self.selection
self.inputSelect(self.selection)
if self["portpic"].instance is not None:
- self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + self.selection + ".png"))
+ picname = self.selection
+ if picname == "DVI" and HardwareInfo().get_device_name() in ("dm500hd", "dm800se"):
+ picname = "HDMI"
+ self["portpic"].instance.setPixmapFromFile(resolveFilename(SCOPE_PLUGINS, "SystemPlugins/Videomode/" + picname + ".png"))
def inputSelect(self, port):
print "inputSelect:", port
modeList = self.hw.getModeList(self.selection)
print "modeList:", modeList
self.port = port
def inputSelect(self, port):
print "inputSelect:", port
modeList = self.hw.getModeList(self.selection)
print "modeList:", modeList
self.port = port
- ratesList = self.listRates(modeList[0][0])
- self.hw.setMode(port = port, mode = modeList[0][0], rate = ratesList[0][0])
+ if (len(modeList) > 0):
+ ratesList = self.listRates(modeList[0][0])
+ self.hw.setMode(port = port, mode = modeList[0][0], rate = ratesList[0][0])
def listModes(self):
list = []
def listModes(self):
list = []
@@
-124,8
+134,12
@@
class VideoWizard(WizardLanguage, Rc):
def modeSelect(self, mode):
ratesList = self.listRates(mode)
print "ratesList:", ratesList
def modeSelect(self, mode):
ratesList = self.listRates(mode)
print "ratesList:", ratesList
- self.hw.setMode(port = self.port, mode = mode, rate = ratesList[0][0])
-
+ if self.port == "DVI" and mode in ("720p", "1080i"):
+ self.rate = "multi"
+ self.hw.setMode(port = self.port, mode = mode, rate = "multi")
+ else:
+ self.hw.setMode(port = self.port, mode = mode, rate = ratesList[0][0])
+
def listRates(self, querymode = None):
if querymode is None:
querymode = self.mode
def listRates(self, querymode = None):
if querymode is None:
querymode = self.mode
@@
-165,7
+179,7
@@
class VideoWizard(WizardLanguage, Rc):
config.misc.showtestcard.value = False
def keyNumberGlobal(self, number):
config.misc.showtestcard.value = False
def keyNumberGlobal(self, number):
- if number in
[1,2,3]
:
+ if number in
(1,2,3)
:
if number == 1:
self.hw.saveMode("DVI", "720p", "multi")
elif number == 2:
if number == 1:
self.hw.saveMode("DVI", "720p", "multi")
elif number == 2: