X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FAudioSelection.py;h=4c6896201d5e04aeb6d4b456761c1b10db7788e2;hb=7f465431a3257815c4b62a1eb672fb4e442a5be2;hp=576fd38138c44f7fa191b516a08dfb50476ff34f;hpb=3698155ca276e4ea2a39ac00a29cc6cb241c28e6;p=vuplus_dvbapp

diff --git a/lib/python/Screens/AudioSelection.py b/lib/python/Screens/AudioSelection.py
index 576fd38..4c68962 100644
--- 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,
-		}, -3)
+		}, -2)
 
 		self.settings = ConfigSubsection()
 		choicelist = [(PAGE_AUDIO,_("audio tracks")), (PAGE_SUBTITLES,_("Subtitles"))]
@@ -62,13 +62,12 @@ class AudioSelection(Screen, ConfigListScreen):
 		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"))
+			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)
@@ -84,7 +83,7 @@ class AudioSelection(Screen, ConfigListScreen):
 					conflist.append(getConfigListEntry(_("Channel"), self.settings.channelmode))
 					self["key_green"].setBoolean(True)
 				else:
-					conflist.append(getConfigListEntry("", ConfigNothing()))
+					conflist.append(('',))
 					self["key_green"].setBoolean(False)
 				selectedAudio = self.audioTracks.getCurrentTrack()
 				for x in range(n):
@@ -141,7 +140,7 @@ class AudioSelection(Screen, ConfigListScreen):
 					language = _("<unknown>")
 					selected = ""
 
-					if sel and x[:4] == sel[:4]:
+					if sel and x == sel:
 						selected = _("Running")
 						selectedidx = idx
 					
@@ -160,7 +159,7 @@ class AudioSelection(Screen, ConfigListScreen):
 						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))
@@ -189,7 +188,7 @@ class AudioSelection(Screen, ConfigListScreen):
 				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)