X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e0f1f56d4acc89b75a67ece4109bb17cc0d1e6d9..5e214d181d1590e0002eabdc6f8395cd6ddde2a7:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 8221fca7..9adaa6db 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -835,12 +835,21 @@ class InfoBarSeek:
 			print "not pauseable."
 			state = self.SEEK_STATE_PLAY
 
-		oldstate = self.seekstate
 		self.seekstate = state
 
-		for i in (0, 1, 2):
-			if oldstate[i] != self.seekstate[i]:
-				(self.session.nav.pause, pauseable.setFastForward, pauseable.setSlowMotion)[i](self.seekstate[i])
+		if pauseable is not None:
+			if self.seekstate[0]:
+				print "resolved to PAUSE"
+				pauseable.pause()
+			elif self.seekstate[1]:
+				print "resolved to FAST FORWARD"
+				pauseable.setFastForward(self.seekstate[1])
+			elif self.seekstate[2]:
+				print "resolved to SLOW MOTION"
+				pauseable.setSlowMotion(self.seekstate[2])
+			else:
+				print "resolved to PLAY"
+				pauseable.unpause()
 
 		for c in self.onPlayStateChanged:
 			c(self.seekstate)
@@ -1622,12 +1631,20 @@ class InfoBarAudioSelection:
 
 			idx = 0
 			while idx < n:
+				cnt = 0
 				i = audio.getTrackInfo(idx)
-				language = i.getLanguage()
+				languages = i.getLanguage().split('/')
 				description = i.getDescription()
+				language = ""
 
-				if LanguageCodes.has_key(language):
-					language = LanguageCodes[language][0]
+				for lang in languages:
+					if cnt:
+						language += ' / '
+					if LanguageCodes.has_key(lang):
+						language += LanguageCodes[lang][0]
+					else:
+						language += lang
+					cnt += 1
 
 				if len(description):
 					description += " (" + language + ")"