no more remove cable or terrestrial transponder when "Clear before scan" is

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

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 49624f35d62682bca10dd304329cc61d80348e1b..34ecfc1458bc8064480f1062a87f099a0eee5c91 100644 (file)
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -2,8 +2,8 @@
 #define __db_h
 
 #ifndef SWIG
-#include <lib/base/eptrlist.h>
 #include <lib/dvb/idvb.h>
+#include <lib/base/eptrlist.h>
 #include <set>
 class ServiceDescriptionSection;
 #endif
@@ -17,7 +17,6 @@ DECLARE_REF(eDVBDB);
        friend class eDVBDBSatellitesQuery;
        friend class eDVBDBProvidersQuery;
 
-
        struct channel
        {
                ePtr<iDVBFrontendParameters> m_frontendParameters;
@@ -33,13 +32,16 @@ DECLARE_REF(eDVBDB);
        ~eDVBDB();
 #endif
 public:
-       RESULT removeService(eServiceReferenceDVB service);
-       RESULT removeServices(eDVBChannelID chid, unsigned int orb_pos);
-       RESULT addFlag(eServiceReferenceDVB service, unsigned int flagmask);
-       RESULT removeFlag(eServiceReferenceDVB service, unsigned int flagmask);
-       RESULT removeFlags(unsigned int flagmask, eDVBChannelID chid, unsigned int orb_pos);
-#ifndef SWIG
 // iDVBChannelList
+       RESULT removeFlags(unsigned int flagmask, int dvb_namespace=-1, int tsid=-1, int onid=-1, unsigned int orb_pos=0xFFFFFFFF);
+       RESULT removeServices(int dvb_namespace=-1, int tsid=-1, int onid=-1, unsigned int orb_pos=0xFFFFFFFF);
+       RESULT removeService(const eServiceReference &service);
+       RESULT addFlag(const eServiceReference &service, unsigned int flagmask);
+       RESULT removeFlag(const eServiceReference &service, unsigned int flagmask);
+#ifndef SWIG
+       RESULT removeFlags(unsigned int flagmask, eDVBChannelID chid, unsigned int orb_pos);
+       RESULT removeServices(eDVBChannelID chid, unsigned int orb_pos);
+
        RESULT addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm);
        RESULT removeChannel(const eDVBChannelID &id);