git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build fixes
[enigma2.git]
/
lib
/
dvb
/
pmt.cpp
diff --git
a/lib/dvb/pmt.cpp
b/lib/dvb/pmt.cpp
index 33ec55c1c83eec47c19a5094a0baed1ef2d0fe96..a6bde907de35fd4cf0b63c079f8ee6a251d7936e 100644
(file)
--- a/
lib/dvb/pmt.cpp
+++ b/
lib/dvb/pmt.cpp
@@
-87,9
+87,9
@@
void eDVBServicePMTHandler::PMTready(int error)
{
m_have_cached_program = false;
serviceEvent(eventNewProgramInfo);
{
m_have_cached_program = false;
serviceEvent(eventNewProgramInfo);
- eEPGCache::getInstance()->PMTready(this);
if (!m_pvr_channel) // don't send campmt to camd.socket for playbacked services
{
if (!m_pvr_channel) // don't send campmt to camd.socket for playbacked services
{
+ eEPGCache::getInstance()->PMTready(this);
if(!m_ca_servicePtr)
{
int demuxes[2] = {0,0};
if(!m_ca_servicePtr)
{
int demuxes[2] = {0,0};
@@
-178,8
+178,8
@@
int eDVBServicePMTHandler::getProgramInfo(struct program &program)
if ( m_service && !m_service->cacheEmpty() )
{
cached_vpid = m_service->getCacheEntry(eDVBService::cVPID);
if ( m_service && !m_service->cacheEmpty() )
{
cached_vpid = m_service->getCacheEntry(eDVBService::cVPID);
- cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cA
C3
PID);
- cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cAPID);
+ cached_apid_mpeg = m_service->getCacheEntry(eDVBService::cAPID);
+ cached_apid_ac3 = m_service->getCacheEntry(eDVBService::cA
C3
PID);
cached_tpid = m_service->getCacheEntry(eDVBService::cTPID);
}
cached_tpid = m_service->getCacheEntry(eDVBService::cTPID);
}
@@
-496,8
+496,9
@@
int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
} else
{
eDVBMetaParser parser;
} else
{
eDVBMetaParser parser;
-
- if (parser.parseFile(ref.path))
+
+ int ret=parser.parseFile(ref.path);
+ if (ret || !parser.m_ref.getServiceID().get() /* incorrect sid in meta file or recordings.epl*/ )
{
eWarning("no .meta file found, trying to find PMT pid");
eDVBTSTools tstools;
{
eWarning("no .meta file found, trying to find PMT pid");
eDVBTSTools tstools;