X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f414a53c337844af29471698a3a3f0708eda4837..1806c7b99229f67aba07d971863f9ed5a725ffbe:/lib/python/Screens/AudioSelection.py

diff --git a/lib/python/Screens/AudioSelection.py b/lib/python/Screens/AudioSelection.py
index a3700ce8..a3841747 100644
--- 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