add possibility to disable debug output

diff --git a/lib/dvb/esection.cpp b/lib/dvb/esection.cpp
index d30aef46b2003227b7770aa10d48a79ac5a3d361..8ec07901873843244adbba64719a49fb43780785 100644 (file)
--- a/lib/dvb/esection.cpp
+++ b/lib/dvb/esection.cpp
@@ -37,7 +37,7 @@ void eGTable::sectionRead(const __u8 *d)
 
 void eGTable::timeout()
 {
 
 void eGTable::timeout()
 {

-       eDebug("timeout %04x!", m_table.pid);
+       TABLE_eDebug("timeout %04x!", m_table.pid);

        if (m_reader)
        {
                m_reader->stop();
        if (m_reader)
        {
                m_reader->stop();


@@ -49,8 +49,8 @@ void eGTable::timeout()
        tableReady(error);
 }
 
        tableReady(error);
 }
 

-eGTable::eGTable():
-               m_timeout(0), error(0)
+eGTable::eGTable(bool debug):
+               m_timeout(0), m_debug(debug), error(0)

 {
 }
 
 {
 }
 


@@ -103,28 +103,28 @@ RESULT eGTable::start(iDVBSectionReader *reader, const eDVBTableSpec &table)
        
        if (!(m_table.flags & eDVBTableSpec::tfAnyVersion))
        {
        
        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
                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]);
                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]);
                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)))
        {
                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;
        }
        
                return res;
        }
        

diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index 5dc84ec6019dba8c823087677d65ce29e1396870..ae8066528353ce22456b8907d0474be5a1552baa 100644 (file)
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -4,6 +4,9 @@
 #include <lib/dvb/idemux.h>
 #include <set>
 
 #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);
 class eGTable: public iObject, public Object
 {
        DECLARE_REF(eGTable);


@@ -18,10 +21,11 @@ class eGTable: public iObject, public Object
        void timeout();
        ePtr<eConnection> m_sectionRead_conn;
 protected:
        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;
        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; }
        RESULT start(iDVBSectionReader *reader, const eDVBTableSpec &table);
        RESULT start(iDVBDemux *reader, const eDVBTableSpec &table);
        RESULT getSpec(eDVBTableSpec &spec) { spec = m_table; return 0; }


@@ -42,7 +46,7 @@ protected:
                unsigned int ssize = sections.size();
                if (max < ssize || nr >= max)
                {
                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;
                }
                                max, ssize, nr, max);
                        return 0;
                }


@@ -55,22 +59,22 @@ protected:
 
                for (unsigned int i = 0; i < max; ++i)
                        if (avail.find(i) != avail.end())
 
                for (unsigned int i = 0; i < max; ++i)
                        if (avail.find(i) != avail.end())

-                               eDebugNoNewLine("+");
+                               TABLE_eDebugNoNewLine("+");

                        else
                        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)
                {
 
                if (avail.size() == max)
                {

-                       eDebug("done!");
+                       TABLE_eDebug("done!");

                        return 1;
                } else
                        return 0;
        }
 public:
        std::vector<Section*> &getSections() { return sections; }
                        return 1;
                } else
                        return 0;
        }
 public:
        std::vector<Section*> &getSections() { return sections; }

-       eTable(): eGTable()
+       eTable(bool debug=true): eGTable(debug)

        {
        }
        ~eTable()
        {
        }
        ~eTable()