void eGTable::timeout()
{
- eDebug("timeout %04x!", m_table.pid);
+ TABLE_eDebug("timeout %04x!", m_table.pid);
if (m_reader)
{
m_reader->stop();
tableReady(error);
}
-eGTable::eGTable():
- m_timeout(0), error(0)
+eGTable::eGTable(bool debug):
+ m_timeout(0), m_debug(debug), error(0)
{
}
if (!(m_table.flags & eDVBTableSpec::tfAnyVersion))
{
- eDebug("doing version filtering");
+ TABLE_eDebug("doing version filtering");
mask.data[3] |= (m_table.version << 1)|1;
mask.mask[3] |= 0x3f;
if (!(m_table.flags & eDVBTableSpec::tfThisVersion))
mask.mode[3] |= 0x3e; // negative filtering
} else
- eDebug("no version filtering");
-
- eDebug("%04x: %02x %02x %02x %02x %02x %02x",
+ TABLE_eDebug("no version filtering");
+
+ TABLE_eDebug("%04x: %02x %02x %02x %02x %02x %02x",
mask.pid,
mask.data[0], mask.data[1], mask.data[2],
mask.data[3], mask.data[4], mask.data[5]);
- eDebug("mask: %02x %02x %02x %02x %02x %02x",
+ TABLE_eDebug("mask: %02x %02x %02x %02x %02x %02x",
mask.mask[0], mask.mask[1], mask.mask[2],
mask.mask[3], mask.mask[4], mask.mask[5]);
- eDebug("mode: %02x %02x %02x %02x %02x %02x",
+ TABLE_eDebug("mode: %02x %02x %02x %02x %02x %02x",
mask.mode[0], mask.mode[1], mask.mode[2],
mask.mode[3], mask.mode[4], mask.mode[5]);
if ((res = m_reader->start(mask)))
{
- eDebug("reader failed to start.");
+ TABLE_eDebug("reader failed to start.");
return res;
}
#include <lib/dvb/idemux.h>
#include <set>
+#define TABLE_eDebug(x...) do { if (m_debug) eDebug(x); } while(0)
+#define TABLE_eDebugNoNewLine(x...) do { if (m_debug) eDebugNoNewLine(x); } while(0)
+
class eGTable: public iObject, public Object
{
DECLARE_REF(eGTable);
void timeout();
ePtr<eConnection> m_sectionRead_conn;
protected:
+ bool m_debug;
virtual int createTable(unsigned int nr, const __u8 *data, unsigned int max)=0;
public:
Signal1<void, int> tableReady;
- eGTable();
+ eGTable(bool debug=true);
RESULT start(iDVBSectionReader *reader, const eDVBTableSpec &table);
RESULT start(iDVBDemux *reader, const eDVBTableSpec &table);
RESULT getSpec(eDVBTableSpec &spec) { spec = m_table; return 0; }
unsigned int ssize = sections.size();
if (max < ssize || nr >= max)
{
- eDebug("kaputt max(%d) < ssize(%d) || nr(%d) >= max(%d)",
+ TABLE_eDebug("kaputt max(%d) < ssize(%d) || nr(%d) >= max(%d)",
max, ssize, nr, max);
return 0;
}
for (unsigned int i = 0; i < max; ++i)
if (avail.find(i) != avail.end())
- eDebugNoNewLine("+");
+ TABLE_eDebugNoNewLine("+");
else
- eDebugNoNewLine("-");
+ TABLE_eDebugNoNewLine("-");
- eDebug(" %d/%d TID %02x", avail.size(), max, data[0]);
+ TABLE_eDebug(" %d/%d TID %02x", avail.size(), max, data[0]);
if (avail.size() == max)
{
- eDebug("done!");
+ TABLE_eDebug("done!");
return 1;
} else
return 0;
}
public:
std::vector<Section*> &getSections() { return sections; }
- eTable(): eGTable()
+ eTable(bool debug=true): eGTable(debug)
{
}
~eTable()