Merge commit 'origin/translations' into experimental

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

diff --git a/lib/dvb/isection.h b/lib/dvb/isection.h
index 04b50f528abacb40a5a5585f3c90ee7b14d2c495..2b48a6b16ae5413897f751e13a8face8adfdd95c 100644 (file)
--- a/lib/dvb/isection.h
+++ b/lib/dvb/isection.h
@@ -3,51 +3,13 @@
 
 #include <lib/dvb/idvb.h>
 
-#ifndef DMX_FILTER_SIZE
-#define DMX_FILTER_SIZE   16
-#endif
-
-struct eDVBSectionFilterMask
-{
-       int pid;
-               /* mode is 0 for positive, 1 for negative filtering */
-       __u8 data[DMX_FILTER_SIZE], mask[DMX_FILTER_SIZE], mode[DMX_FILTER_SIZE];
-       enum {
-               rfCRC=1,
-               rfNoAbort=2
-       };
-       int flags;
-};
-
-struct eDVBTableSpec
-{
-       int pid, tid, tidext;
-       int version;
-       int timeout;        /* timeout in ms */
-       enum
-       {
-               tfInOrder=1,
-               /*
-                       tfAnyVersion      filter ANY version
-                       0                 filter all EXCEPT given version (negative filtering)
-                       tfThisVersion     filter only THIS version
-               */
-               tfAnyVersion=2,
-               tfThisVersion=4,
-               tfHaveTID=8,
-               tfHaveTIDExt=16,
-               tfCheckCRC=32,
-               tfHaveTimeout=64,
-       };
-       int flags;
-};
-
-class iDVBSectionReader: public virtual iObject
+class iDVBSectionReader: public iObject
 {
 public:
        virtual RESULT start(const eDVBSectionFilterMask &mask)=0;
        virtual RESULT stop()=0;
        virtual RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn)=0;
+       virtual ~iDVBSectionReader() { };
 };
 
 #endif