diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-05-11 13:10:34 +0200 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2009-05-11 13:10:34 +0200 |
| commit | 5c89990b9cdd642f31a54a0fe507fa221abceba1 (patch) | |
| tree | bfff5b3c2ecfdcd686909cc09132e2157afba1dc | |
| parent | 92554c8325411acd3acaec7c15be420f180907c4 (diff) | |
| parent | da4b044a4c350e307bf3e8ee5a211eda4a6ebac6 (diff) | |
| download | enigma2-5c89990b9cdd642f31a54a0fe507fa221abceba1.tar.gz enigma2-5c89990b9cdd642f31a54a0fe507fa221abceba1.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
| -rw-r--r-- | lib/dvb/pmt.cpp | 10 | ||||
| -rw-r--r-- | lib/python/Screens/InfoBarGenerics.py | 14 |
2 files changed, 19 insertions, 5 deletions
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index 0198c8f7..da45c8eb 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -399,10 +399,16 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program) case ISO_639_LANGUAGE_DESCRIPTOR: if (!isvideo) { + int cnt=0; const Iso639LanguageList *languages = ((Iso639LanguageDescriptor*)*desc)->getIso639Languages(); /* use last language code */ - for (Iso639LanguageConstIterator i(languages->begin()); i != languages->end(); ++i) - audio.language_code = (*i)->getIso639LanguageCode(); + for (Iso639LanguageConstIterator i(languages->begin()); i != languages->end(); ++i, ++cnt) + { + if (cnt == 0) + audio.language_code = (*i)->getIso639LanguageCode(); + else + audio.language_code += "/" + (*i)->getIso639LanguageCode(); + } } break; case STREAM_IDENTIFIER_DESCRIPTOR: diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index c1618184..9adaa6db 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -1631,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 + ")" |