use NumericalTextInput to jump to entries in ChannelSelection (jumping needs to imple...

[enigma2.git] / lib / python / Screens / AudioSelection.py

diff --git a/lib/python/Screens/AudioSelection.py b/lib/python/Screens/AudioSelection.py
index a3700ce8f835413b9c4000d67a011eebd39fd926..a38417475e62feaee4b6b106280812d499dcdf21 100644 (file)
--- a/lib/python/Screens/AudioSelection.py
+++ b/lib/python/Screens/AudioSelection.py
@@ -2,26 +2,41 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.MenuList import MenuList
 from Components.Label import Label
+from Tools.ISO639 import LanguageCodes
 
 class AudioSelection(Screen):
+       def KeyOk(self):
+               selection = self["tracks"].getCurrent()
+               print "select track " + str(selection[1])
+               
+               self.audio.selectTrack(selection[1])
+               self.close()
        def __init__(self, session, audio):
                Screen.__init__(self, session)
 
-               self["actions"] = ActionMap(["SetupActions"], 
+               self["actions"] = ActionMap(["OkCancelActions"], 
                        {
                                "cancel": self.close,
-                               "ok": self.close,
+                               "ok": self.KeyOk,
                        })
 
-               tlist = []
+               self.audio = audio
 
+               tlist = []
                n = audio.getNumberOfTracks()
-               print "AUDIO TRACKS:"
                for x in range(n):
                        i = audio.getTrackInfo(x)
-                       print i.getDescription()
-                       tlist.append((i.getDescription(), x))
+                       langCode = i.getLanguage()
+                       
+                       description = i.getDescription();
+                       
+                       if langCode in LanguageCodes:
+                               language = LanguageCodes[langCode][0]
+                               if len(description):
+                                       description += " (" + language + ")"
+                               else:
+                                       description = language
+
+                       tlist.append((description, x))
 
                self["tracks"] = MenuList(tlist)
-               #self["tracks"] = Label("Blasel")
-               
\ No newline at end of file