git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pootle-import'
[enigma2.git]
/
lib
/
python
/
Screens
/
AudioSelection.py
diff --git
a/lib/python/Screens/AudioSelection.py
b/lib/python/Screens/AudioSelection.py
index b3b82b46d0fed8d6477bff4f304649bfaf305ec4..4c6896201d5e04aeb6d4b456761c1b10db7788e2 100644
(file)
--- a/
lib/python/Screens/AudioSelection.py
+++ b/
lib/python/Screens/AudioSelection.py
@@
-46,7
+46,7
@@
class AudioSelection(Screen, ConfigListScreen):
"cancel": self.cancel,
"up": self.keyUp,
"down": self.keyDown,
"cancel": self.cancel,
"up": self.keyUp,
"down": self.keyDown,
- }, -
3
)
+ }, -
2
)
self.settings = ConfigSubsection()
choicelist = [(PAGE_AUDIO,_("audio tracks")), (PAGE_SUBTITLES,_("Subtitles"))]
self.settings = ConfigSubsection()
choicelist = [(PAGE_AUDIO,_("audio tracks")), (PAGE_SUBTITLES,_("Subtitles"))]
@@
-62,13
+62,12
@@
class AudioSelection(Screen, ConfigListScreen):
streams = []
conflist = []
selectedidx = 0
streams = []
conflist = []
selectedidx = 0
-
- service = self.session.nav.getCurrentService()
- self.audioTracks = audio = service and service.audioTracks()
- n = audio and audio.getNumberOfTracks() or 0
-
+
if self.settings.menupage.getValue() == PAGE_AUDIO:
self.setTitle(_("Select audio track"))
if self.settings.menupage.getValue() == PAGE_AUDIO:
self.setTitle(_("Select audio track"))
+ service = self.session.nav.getCurrentService()
+ self.audioTracks = audio = service and service.audioTracks()
+ n = audio and audio.getNumberOfTracks() or 0
if SystemInfo["CanDownmixAC3"]:
self.settings.downmix = ConfigOnOff(default=config.av.downmix_ac3.value)
self.settings.downmix.addNotifier(self.changeAC3Downmix, initial_call = False)
if SystemInfo["CanDownmixAC3"]:
self.settings.downmix = ConfigOnOff(default=config.av.downmix_ac3.value)
self.settings.downmix.addNotifier(self.changeAC3Downmix, initial_call = False)
@@
-160,7
+159,7
@@
class AudioSelection(Screen, ConfigListScreen):
number = "%x%02x" % (x[3],x[2])
elif x[0] == 2:
number = "%x%02x" % (x[3],x[2])
elif x[0] == 2:
- types = (
"UTF-8 text","SSA / AAS",".SRT file","VOB
")
+ types = (
_("<unknown>"), "UTF-8 text", "SSA", "AAS", ".SRT file", "VOB", "PGS (unsupported)
")
description = types[x[2]]
streams.append((x, "", number, description, language, selected))
description = types[x[2]]
streams.append((x, "", number, description, language, selected))
@@
-189,7
+188,7
@@
class AudioSelection(Screen, ConfigListScreen):
conflist.append(getConfigListEntry(Plugins[0][0], ConfigNothing()))
self.plugincallfunc = Plugins[0][1]
if len(Plugins) > 1:
conflist.append(getConfigListEntry(Plugins[0][0], ConfigNothing()))
self.plugincallfunc = Plugins[0][1]
if len(Plugins) > 1:
- print "
these plugins are
installed but not displayed in the dialog box:", Plugins[1:]
+ print "
plugin(s)
installed but not displayed in the dialog box:", Plugins[1:]
self["config"].list = conflist
self["config"].l.setList(conflist)
self["config"].list = conflist
self["config"].l.setList(conflist)