X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/925629a36b521924a774da09b4f11515dd1889b3..6b924837dedad17ea56ca37075e760828469abcb:/lib/dvb/pmt.cpp

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 279ec74f..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:
@@ -605,12 +611,15 @@ void eDVBServicePMTHandler::SDTScanEvent(int event)
 	}
 }
 
-int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue, bool simulate)
+int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue, bool simulate, eDVBService *service)
 {
 	RESULT res=0;
 	m_reference = ref;
 	
 	m_use_decode_demux = use_decode_demux;
+
+		/* use given service as backup. This is used for timeshift where we want to clone the live stream using the cache, but in fact have a PVR channel */
+	m_service = service;
 	
 		/* is this a normal (non PVR) channel? */
 	if (ref.path.empty())