X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/999ddaa2a3953f5e16549483cd8deb021685fc5b..d76147db7a81fe6eebd1c9759d8d38b7cf41726a:/lib/dvb/pmt.cpp diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index 7f560c8e..255b8765 100644 --- 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); - eEPGCache::getInstance()->PMTready(this); 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}; @@ -496,8 +496,9 @@ int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, } 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; @@ -865,7 +866,7 @@ static PyObject *createTuple(int pid, const char *type) return r; } -static inline PyList_AppendSteal(PyObject *list, PyObject *item) +static inline void PyList_AppendSteal(PyObject *list, PyObject *item) { PyList_Append(list, item); Py_DECREF(item);