add support for private epg

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

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 6b2c835c51e427643fef831a03c110d2daebe19c..ec38b37c4b5373369caec494f2e8d632800127bb 100644 (file)
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -4,6 +4,7 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/metaparser.h>
 #include <lib/dvb_ci/dvbci.h>
+#include <lib/dvb/epgcache.h>
 #include <dvbsi++/ca_program_map_section.h>
 #include <dvbsi++/descriptor_tag.h>
 #include <dvbsi++/iso639_language_descriptor.h>
@@ -72,6 +73,7 @@ void eDVBServicePMTHandler::PMTready(int error)
        else
        {
                serviceEvent(eventNewProgramInfo);
+               eEPGCache::getInstance()->PMTready(this);
                if (!m_pvr_channel)
                {
                        if(!m_ca_servicePtr)   // don't send campmt to camd.socket for playbacked services
@@ -129,6 +131,15 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 
        if (!m_PMT.getCurrent(ptr))
        {
+               int cached_apid_ac3 = -1;
+               int cached_apid_mpeg = -1;
+               int cached_vpid = -1;
+               if ( m_service && !m_service->cacheEmpty() )
+               {
+                       cached_vpid = m_service->getCachePID(eDVBService::cVPID);
+                       cached_apid_mpeg = m_service->getCachePID(eDVBService::cAC3PID);
+                       cached_apid_ac3 = m_service->getCachePID(eDVBService::cAPID);
+               }
                eDVBTableSpec table_spec;
                ptr->getSpec(table_spec);
                program.pmtPid = table_spec.pid < 0x1fff ? table_spec.pid : -1;
@@ -201,9 +212,26 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
                                        break;
                                }
                                if (isaudio)
-                                       program.audioStreams.push_back(audio);
+                               {
+                                       if ( !program.audioStreams.empty() &&
+                                               ( audio.pid == cached_apid_ac3 || audio.pid == cached_apid_mpeg) )
+                                       {
+                                               program.audioStreams.push_back(program.audioStreams[0]);
+                                               program.audioStreams[0] = audio;
+                                       }
+                                       else
+                                               program.audioStreams.push_back(audio);
+                               }
                                else if (isvideo)
-                                       program.videoStreams.push_back(video);
+                               {
+                                       if ( !program.videoStreams.empty() && video.pid == cached_vpid )
+                                       {
+                                               program.videoStreams.push_back(program.videoStreams[0]);
+                                               program.videoStreams[0] = video;
+                                       }
+                                       else
+                                               program.videoStreams.push_back(video);
+                               }
                                else
                                        continue;
                                if ( cadescriptors > 0 )