audio = service and service.audioTracks()
n = audio and audio.getNumberOfTracks() or 0
if n > 0:
- from DVDTitle import ConfigFixedText, ConfigActiveTrack
+ from DVDTitle import ConfigFixedText
from TitleProperties import languageChoices
- from Components.config import config, ConfigSubsection, ConfigSelection
+ from Components.config import config, ConfigSubsection, ConfigSubList, ConfigSelection, ConfigYesNo
+ self.t.properties.audiotracks = ConfigSubList()
for x in range(n):
i = audio.getTrackInfo(x)
- language = i.getLanguage()
+ DVB_lang = i.getLanguage()
description = i.getDescription()
pid = str(i.getPID())
if description == "MPEG":
description = "MP2"
- if not languageChoices.langdict.has_key(language):
- language="nolang"
- print "[audiotrack] pid:", pid, "description:", description, "language:", language
+ print "[audiotrack] pid:", pid, "description:", description, "language:", DVB_lang
self.t.properties.audiotracks.append(ConfigSubsection())
- self.t.properties.audiotracks[-1].active = ConfigActiveTrack()
+ self.t.properties.audiotracks[-1].active = ConfigYesNo(default = True)
self.t.properties.audiotracks[-1].format = ConfigFixedText(description)
- self.t.properties.audiotracks[-1].language = ConfigSelection(choices = languageChoices.choices, default=language)
+ self.t.properties.audiotracks[-1].language = ConfigSelection(choices = languageChoices.choices, default=languageChoices.getLanguage(DVB_lang))
self.t.properties.audiotracks[-1].pid = ConfigFixedText(pid)
+ self.t.properties.audiotracks[-1].DVB_lang = ConfigFixedText(DVB_lang)
sAspect = service.info().getInfo(iServiceInformation.sAspect)
if sAspect in ( 1, 2, 5, 6, 9, 0xA, 0xD, 0xE ):
aspect = "4:3"