From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Sat, 6 Jan 2007 16:24:53 +0000 (+0000)
Subject: one definition is enough
X-Git-Tag: 2.6.0~2510
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/b6bb02750e7e7e44d6c4e99a9754006a1e1051e5?hp=0c694cee579948974d1c12750695e044a00216a0

one definition is enough
---

diff --git a/lib/dvb/idemux.h b/lib/dvb/idemux.h
index b04ad000..2b750882 100644
--- a/lib/dvb/idemux.h
+++ b/lib/dvb/idemux.h
@@ -3,47 +3,6 @@
 
 #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, tid_mask, tidext_mask;
-	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,
-		tfHaveTIDMask=128,
-		tfHaveTIDExtMask=256
-	};
-	int flags;
-};
-
 class iDVBSectionReader: public iObject
 {
 public:
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index a34be984..d5f399c0 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -27,6 +27,47 @@
 #define CAID_LIST std::slist<uint16_t>
 #endif
 
+#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, tid_mask, tidext_mask;
+	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,
+		tfHaveTIDMask=128,
+		tfHaveTIDExtMask=256
+	};
+	int flags;
+};
+
 struct eBouquet
 {
 	std::string m_bouquet_name;
diff --git a/lib/dvb/isection.h b/lib/dvb/isection.h
index 5a0c5cf4..2b48a6b1 100644
--- a/lib/dvb/isection.h
+++ b/lib/dvb/isection.h
@@ -3,47 +3,6 @@
 
 #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, tid_mask, tidext_mask;
-	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,
-		tfHaveTIDMask=128,
-		tfHaveTIDExtMask=256
-	};
-	int flags;
-};
-
 class iDVBSectionReader: public iObject
 {
 public: