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 (from parent 1:
ce8e939
)
Revert "check sid and tsid before start automatic service update (STD update)"
author
ghost
<andreas.monzner@multimedia-labs.de>
Sun, 2 Nov 2008 11:52:14 +0000
(12:52 +0100)
committer
Andreas Oberritter
<obi@saftware.de>
Thu, 6 Nov 2008 00:47:04 +0000
(
01:47
+0100)
This reverts commit
21812866841eec7ab7a79ee61067581f8202df55
.
lib/dvb/pmt.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/pmt.cpp
b/lib/dvb/pmt.cpp
index 13734e0d75278fc1315d443a788aec6f03e09a87..6082bf4ad43c48d8373c2f1d4e884699d195ac88 100644
(file)
--- a/
lib/dvb/pmt.cpp
+++ b/
lib/dvb/pmt.cpp
@@
-135,19
+135,7
@@
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);
}
@@
-616,7
+604,10
@@
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 = 0;
+ {
+ m_dvb_scan = new eDVBScan(m_channel, true, false);
+ m_dvb_scan->connectEvent(slot(*this, &eDVBServicePMTHandler::SDTScanEvent), m_scan_event_connection);
+ }
} else
{
if (res == eDVBResourceManager::errAllSourcesBusy)
} else
{
if (res == eDVBResourceManager::errAllSourcesBusy)