Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / dvb / pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 0198c8f75b3a711e5eb94b8ff887f09608b8f96f..da45c8eb4733f95e290d3876424f384172308b13 100644 (file)
--- 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: