git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix DVB-T inversion
[enigma2.git]
/
lib
/
dvb
/
pmt.cpp
diff --git
a/lib/dvb/pmt.cpp
b/lib/dvb/pmt.cpp
index c06701113178b080b9f061840d1dbd06765133ea..5ea47467a5a596e60513d2f6271545b3a0c803cf 100644
(file)
--- a/
lib/dvb/pmt.cpp
+++ b/
lib/dvb/pmt.cpp
@@
-36,7
+36,7
@@
void eDVBServicePMTHandler::channelStateChanged(iDVBChannel *channel)
{
if (m_channel)
if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode))
{
if (m_channel)
if (m_channel->getDemux(m_demux, (!m_use_decode_demux) ? 0 : iDVBChannel::capDecode))
- eDebug("Allocating
a demux for now tuned-in channel failed.
");
+ eDebug("Allocating
%s-decoding a demux for now tuned-in channel failed.", m_use_decode_demux ? "" : "non-
");
serviceEvent(eventTuned);
serviceEvent(eventTuned);
@@
-145,7
+145,7
@@
int eDVBServicePMTHandler::getProgramInfo(struct program &program)
program.pmtPid = -1;
program.textPid = -1;
program.pmtPid = -1;
program.textPid = -1;
- if (!m_PMT.getCurrent(ptr))
+ if (
((m_service && m_service->usePMT()) || !m_service) &&
!m_PMT.getCurrent(ptr))
{
int cached_apid_ac3 = -1;
int cached_apid_mpeg = -1;
{
int cached_apid_ac3 = -1;
int cached_apid_mpeg = -1;
@@
-350,6
+350,8
@@
int eDVBServicePMTHandler::getDecodeDemux(ePtr<iDVBDemux> &demux)
demux = m_demux;
return ret;
}
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)
ret = m_channel->getDemux(demux, iDVBChannel::capDecode);
if (!ret)
@@
-401,7
+403,6
@@
int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
m_pmt_pid = pmt_pid;
}
}
m_pmt_pid = pmt_pid;
}
}
-
} else
m_reference = parser.m_ref;
} else
m_reference = parser.m_ref;
@@
-412,7
+413,11
@@
int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
eDebug("allocatePVRChannel failed!\n");
m_channel = m_pvr_channel;
}
eDebug("allocatePVRChannel failed!\n");
m_channel = m_pvr_channel;
}
-
+
+ ePtr<iDVBChannelList> db;
+ if (!m_resourceManager->getChannelList(db))
+ db->getService((eServiceReferenceDVB&)m_reference, m_service);
+
if (m_channel)
{
m_channel->connectStateChange(
if (m_channel)
{
m_channel->connectStateChange(
@@
-436,10
+441,6
@@
int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
m_pvr_channel->playFile(ref.path.c_str());
}
m_pvr_channel->playFile(ref.path.c_str());
}
- ePtr<iDVBChannelList> db;
- if (!m_resourceManager->getChannelList(db))
- db->getService((eServiceReferenceDVB&)m_reference, m_service);
-
return res;
}
return res;
}