more complete implementation of national option character subsets

[enigma2.git] / lib / dvb / esection.h

diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index 6b8c87843fcede09df35054522dccc12114f012d..6c1683fe40e6e158978f128caa1814a1d035fc73 100644 (file)
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -1,16 +1,18 @@
 #ifndef __esection_h
 #define __esection_h
 
-#include <lib/dvb/isection.h>
+#include <lib/dvb/idemux.h>
 #include <set>
 
 class eGTable: public iObject, public Object
 {
-DECLARE_REF;
+DECLARE_REF(eGTable);
 private:
        ePtr<iDVBSectionReader> m_reader;
        eDVBTableSpec m_table;
        
+       unsigned int m_tries;
+       
        eTimer *m_timeout;
 
        void sectionRead(const __u8 *data);
@@ -42,7 +44,6 @@ protected:
                        delete sections[nr];
                sections.resize(max);
                
-               
                sections[nr] = new Section(data);
                avail.insert(nr);
 
@@ -97,7 +98,13 @@ public:
 
        ~eAUTable()
        {
-               current=next=0;
+               stop();
+       }
+       
+       void stop()
+       {
+               current = next = 0;
+               m_demux = 0;
        }
        
        int begin(eMainloop *m, const eDVBTableSpec &spec, ePtr<iDVBDemux> demux)