From: ghost Date: Mon, 29 Nov 2010 08:52:58 +0000 (+0100) Subject: fixes PMT pid searching for TS files without meta file and sid in servicref (this... X-Git-Tag: exp-2010.12~4^2 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/356d37043cbe1265a83c985e2cef7185daf74cb9 fixes PMT pid searching for TS files without meta file and sid in servicref (this fixes SID not found in PAT messages) refs #124 --- diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index d44766f1..cb80b00f 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -742,13 +742,12 @@ int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_dem { if (!ref.getServiceID().get() /* incorrect sid in meta file or recordings.epl*/ ) { - eWarning("no .meta file found, trying to find PMT pid"); eDVBTSTools tstools; + bool b = source || !tstools.openFile(ref.path.c_str(), 1); + eWarning("no .meta file found, trying to find PMT pid"); if (source) - tstools.setSource(source, streaminfo_file ? streaminfo_file : ref.path.c_str()); - else if (tstools.openFile(ref.path.c_str())) - eWarning("failed to open file"); - else + tstools.setSource(source, NULL); + if (b) { int service_id, pmt_pid; if (!tstools.findPMT(pmt_pid, service_id)) @@ -758,6 +757,8 @@ int eDVBServicePMTHandler::tuneExt(eServiceReferenceDVB &ref, int use_decode_dem m_pmt_pid = pmt_pid; } } + else + eWarning("no valid source to find PMT pid!"); } eDebug("alloc PVR"); /* allocate PVR */