add assertion to help debugging

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

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index d1644e7a36a5bd6b8a173080958efac587c5b7ee..f23696b05ba0858fd51c7e41c36a061dd85f2348 100644 (file)
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -15,6 +15,7 @@ eDVBServicePMTHandler::eDVBServicePMTHandler()
        :m_ca_servicePtr(0), m_decode_demux_num(0xFF)
 {
        m_use_decode_demux = 0;
+       m_pmt_pid = -1;
        eDVBResourceManager::getInstance(m_resourceManager);
        CONNECT(m_PMT.tableReady, eDVBServicePMTHandler::PMTready);
        CONNECT(m_PAT.tableReady, eDVBServicePMTHandler::PATready);
@@ -43,7 +44,10 @@ void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
                {
                        eDebug("ok ... now we start!!");
 
-                       m_PAT.begin(eApp, eDVBPATSpec(), m_demux);
+                       if (m_pmt_pid == -1)
+                               m_PAT.begin(eApp, eDVBPATSpec(), m_demux);
+                       else
+                               m_PMT.begin(eApp, eDVBPMTSpec(m_pmt_pid, m_reference.getServiceID().get()), m_demux);
 
                        if ( m_service && !m_service->cacheEmpty() )
                                serviceEvent(eventNewProgramInfo);
@@ -346,6 +350,8 @@ int eDVBServicePMTHandler::getDecodeDemux(ePtr<iDVBDemux> &demux)
                demux = m_demux;
                return ret;
        }
+       
+       ASSERT(m_channel); /* calling without a previous ::tune is certainly bad. */
 
        ret = m_channel->getDemux(demux, iDVBChannel::capDecode);
        if (!ret)
@@ -382,8 +388,22 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
                eDVBMetaParser parser;
                
                if (parser.parseFile(ref.path))
-                       eWarning("no .meta file found, trying original service ref.");
-               else
+               {
+                       eWarning("no .meta file found, trying to find PMT pid");
+                       eDVBTSTools tstools;
+                       if (tstools.openFile(ref.path.c_str()))
+                               eWarning("failed to open file");
+                       else
+                       {
+                               int service_id, pmt_pid;
+                               if (!tstools.findPMT(pmt_pid, service_id))
+                               {
+                                       eDebug("PMT pid found on pid %04x, service id %d", pmt_pid, service_id);
+                                       m_reference.setServiceID(service_id);
+                                       m_pmt_pid = pmt_pid;
+                               }
+                       }
+               } else
                        m_reference = parser.m_ref;
                
                eDebug("alloc PVR");