git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bac628c
)
check sid and tsid before start automatic service update (STD update)
author
ghost
<andreas.monzner@multimedia-labs.de>
Sun, 2 Nov 2008 09:42:12 +0000
(10:42 +0100)
committer
Andreas Oberritter
<obi@saftware.de>
Thu, 6 Nov 2008 00:52:04 +0000
(
01:52
+0100)
lib/dvb/pmt.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/pmt.cpp
b/lib/dvb/pmt.cpp
index 6082bf4ad43c48d8373c2f1d4e884699d195ac88..13734e0d75278fc1315d443a788aec6f03e09a87 100644
(file)
--- a/
lib/dvb/pmt.cpp
+++ b/
lib/dvb/pmt.cpp
@@
-135,7
+135,19
@@
void eDVBServicePMTHandler::PATready(int)
if (pmtpid == -1)
serviceEvent(eventNoPATEntry);
else
if (pmtpid == -1)
serviceEvent(eventNoPATEntry);
else
+ { // here we know a pat entry for this service id exist
m_PMT.begin(eApp, eDVBPMTSpec(pmtpid, m_reference.getServiceID().get()), m_demux);
m_PMT.begin(eApp, eDVBPMTSpec(pmtpid, m_reference.getServiceID().get()), m_demux);
+ if (m_reference.path.empty())
+ { // also check the tsid now before start sdt update
+ eDVBChannelID chid;
+ m_reference.getChannelID(chid);
+ if (eTransportStreamID((*i)->getTableIdExtension()) == chid.transport_stream_id)
+ {
+ m_dvb_scan = new eDVBScan(m_channel, true, false);
+ m_dvb_scan->connectEvent(slot(*this, &eDVBServicePMTHandler::SDTScanEvent), m_scan_event_connection);
+ }
+ }
+ }
} else
serviceEvent(eventNoPAT);
}
} else
serviceEvent(eventNoPAT);
}
@@
-604,10
+616,7
@@
int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux,
m_channelEvent_connection);
if (ref.path.empty())
m_channelEvent_connection);
if (ref.path.empty())
- {
- m_dvb_scan = new eDVBScan(m_channel, true, false);
- m_dvb_scan->connectEvent(slot(*this, &eDVBServicePMTHandler::SDTScanEvent), m_scan_event_connection);
- }
+ m_dvb_scan = 0;
} else
{
if (res == eDVBResourceManager::errAllSourcesBusy)
} else
{
if (res == eDVBResourceManager::errAllSourcesBusy)