X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fdb.h;h=44393afdfec43d5eae0e3d78e0545ab27c2b7712;hb=99e6feec1546d5fa2ff8e5cdfdf84438db4281b3;hp=49624f35d62682bca10dd304329cc61d80348e1b;hpb=185319be599e9f42cd695da14c01499fc79f68d5;p=vuplus_dvbapp

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 49624f3..44393af 100644
--- 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,19 @@ 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);
+	PyObject *readSatellites(SWIG_PYOBJECT(ePyObject) sat_list, SWIG_PYOBJECT(ePyObject) sat_dict, SWIG_PYOBJECT(ePyObject) tp_dict);
+	PyObject *readTerrestrials(SWIG_PYOBJECT(ePyObject) ter_list, SWIG_PYOBJECT(ePyObject) tp_dict);
+	PyObject *readCables(SWIG_PYOBJECT(ePyObject) cab_list, SWIG_PYOBJECT(ePyObject) tp_dict);
+#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);