diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-29 09:53:31 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-29 09:53:31 +0100 |
| commit | e6d95074399c5cb2172710fda726c9ba4df2e373 (patch) | |
| tree | 54459fb923ea69d75529fd8bf62e93ee76d12f99 | |
| parent | f24ecae61fc0bc84496bec107f70730ff62930d9 (diff) | |
| parent | 356d37043cbe1265a83c985e2cef7185daf74cb9 (diff) | |
| download | enigma2-e6d95074399c5cb2172710fda726c9ba4df2e373.tar.gz enigma2-e6d95074399c5cb2172710fda726c9ba4df2e373.zip | |
Merge branch 'bug_124_m2ts_support' into experimental
| -rw-r--r-- | lib/dvb/pmt.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp index d6f26850..ee6bb19d 100644 --- a/lib/dvb/pmt.cpp +++ b/lib/dvb/pmt.cpp @@ -765,13 +765,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)) @@ -781,6 +780,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 */ |