git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more work on keyboard support
[enigma2.git]
/
lib
/
dvb
/
esection.cpp
diff --git
a/lib/dvb/esection.cpp
b/lib/dvb/esection.cpp
index 6f634ae1246adf846b97f13cb4ce43e66fceafab..4758008a88db6e20235d1ebffbf78fc573807e8d 100644
(file)
--- a/
lib/dvb/esection.cpp
+++ b/
lib/dvb/esection.cpp
@@
-8,12
+8,27
@@
void eGTable::sectionRead(const __u8 *d)
m_table.flags |= eDVBTableSpec::tfThisVersion;
m_table.version = (d[5]>>1)&0x1F;
m_table.flags |= eDVBTableSpec::tfThisVersion;
m_table.version = (d[5]>>1)&0x1F;
+ /* if a section is missing, we retry reading the
+ whole data up to 5 times. if after that the
+ section is still missing, we timeout. */
+ if (m_tries > 5 * (last_section_number+1))
+ {
+ timeout();
+ return;
+ }
+
+ m_tries++;
if (createTable(d[6], d, last_section_number + 1))
{
if (m_timeout)
m_timeout->stop();
if (createTable(d[6], d, last_section_number + 1))
{
if (m_timeout)
m_timeout->stop();
- m_reader->stop();
+ if (m_reader)
+ {
+ m_reader->stop();
+ m_reader=0;
+ }
+ m_sectionRead_conn=0;
ready = 1;
tableReady(error);
} else if ((m_table.flags & eDVBTableSpec::tfHaveTimeout) && m_timeout)
ready = 1;
tableReady(error);
} else if ((m_table.flags & eDVBTableSpec::tfHaveTimeout) && m_timeout)
@@
-22,9
+37,13
@@
void eGTable::sectionRead(const __u8 *d)
void eGTable::timeout()
{
void eGTable::timeout()
{
- printf("timeout!\n");
-// eDebug("timeout!");
- m_reader->stop();
+ eDebug("timeout!");
+ if (m_reader)
+ {
+ m_reader->stop();
+ m_reader=0;
+ }
+ m_sectionRead_conn=0;
ready = 1;
error = -1;
tableReady(error);
ready = 1;
error = -1;
tableReady(error);
@@
-45,6
+64,8
@@
RESULT eGTable::start(iDVBSectionReader *reader, const eDVBTableSpec &table)
m_reader = reader;
m_reader->connectRead(slot(*this, &eGTable::sectionRead), m_sectionRead_conn);
m_reader = reader;
m_reader->connectRead(slot(*this, &eGTable::sectionRead), m_sectionRead_conn);
+ m_tries = 0;
+
// setup filter struct
eDVBSectionFilterMask mask;
// setup filter struct
eDVBSectionFilterMask mask;
@@
-58,15
+79,26
@@
RESULT eGTable::start(iDVBSectionReader *reader, const eDVBTableSpec &table)
if (m_table.flags & eDVBTableSpec::tfHaveTID)
{
mask.data[0] = m_table.tid;
if (m_table.flags & eDVBTableSpec::tfHaveTID)
{
mask.data[0] = m_table.tid;
- mask.mask[0] = 0xFF;
+ if (m_table.flags & eDVBTableSpec::tfHaveTIDMask)
+ mask.mask[0] = m_table.tid_mask;
+ else
+ mask.mask[0] = 0xFF;
}
}
-
+
if (m_table.flags & eDVBTableSpec::tfHaveTIDExt)
{
mask.data[1] = m_table.tidext >> 8;
mask.data[2] = m_table.tidext;
if (m_table.flags & eDVBTableSpec::tfHaveTIDExt)
{
mask.data[1] = m_table.tidext >> 8;
mask.data[2] = m_table.tidext;
- mask.mask[1] = 0xFF;
- mask.mask[2] = 0xFF;
+ if (m_table.flags & eDVBTableSpec::tfHaveTIDExtMask)
+ {
+ mask.mask[1] = m_table.tidext_mask >> 8;
+ mask.mask[2] = m_table.tidext_mask;
+ }
+ else
+ {
+ mask.mask[1] = 0xFF;
+ mask.mask[2] = 0xFF;
+ }
}
if (!(m_table.flags & eDVBTableSpec::tfAnyVersion))
}
if (!(m_table.flags & eDVBTableSpec::tfAnyVersion))