X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/942f9e8554c495e6782d93524c8e820ec548a8a9..661a3e90b05b18185639d43ff30b9ae3532561c4:/lib/dvb/db.h

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index c5e3ff5c..bf39df18 100644
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -1,18 +1,23 @@
 #ifndef __db_h
 #define __db_h
 
+#ifndef SWIG
 #include <lib/base/eptrlist.h>
 #include <lib/dvb/idvb.h>
 #include <set>
-
 class ServiceDescriptionSection;
+#endif
 
 class eDVBDB: public iDVBChannelList
 {
+	static eDVBDB *instance;
 DECLARE_REF(eDVBDB);
 	friend class eDVBDBQuery;
 	friend class eDVBDBBouquetQuery;
-private:
+	friend class eDVBDBSatellitesQuery;
+	friend class eDVBDBProvidersQuery;
+
+
 	struct channel
 	{
 		ePtr<iDVBFrontendParameters> m_frontendParameters;
@@ -23,16 +28,13 @@ private:
 	std::map<eServiceReferenceDVB, ePtr<eDVBService> > m_services;
 	
 	std::map<std::string, eBouquet> m_bouquets;
-public:
-	void load();
-	void save();
-
-	void loadBouquet(const char *path);
-	void loadBouquets();
-
+#ifdef SWIG
 	eDVBDB();
-	virtual ~eDVBDB();
-	
+	~eDVBDB();
+#endif
+public:
+#ifndef SWIG
+// iDVBChannelList
 	RESULT addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm);
 	RESULT removeChannel(const eDVBChannelID &id);
 
@@ -45,20 +47,29 @@ public:
 	RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source);
 
 	RESULT getBouquet(const eServiceReference &ref, eBouquet* &bouquet);
+//////
+	void saveServicelist();
+	void loadBouquet(const char *path);
+	eDVBDB();
+	virtual ~eDVBDB();
+#endif
+	static eDVBDB *getInstance() { return instance; }
+	void reloadServicelist();
+	void reloadBouquets();
 };
 
+#ifndef SWIG
 	// we have to add a possibility to invalidate here.
 class eDVBDBQueryBase: public iDVBChannelListQuery
 {
 DECLARE_REF(eDVBDBQueryBase);
 protected:
-	std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator m_cursor;
 	ePtr<eDVBDB> m_db;
 	ePtr<eDVBChannelQuery> m_query;
 	eServiceReference m_source;
 public:
 	eDVBDBQueryBase(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
-	int compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b);
+	virtual int compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b);
 };
 
 class eDVBDBQuery: public eDVBDBQueryBase
@@ -77,4 +88,28 @@ public:
 	RESULT getNextResult(eServiceReferenceDVB &ref);
 };
 
+class eDVBDBListQuery: public eDVBDBQueryBase
+{
+protected:
+	std::list<eServiceReferenceDVB> m_list;
+	std::list<eServiceReferenceDVB>::iterator m_cursor;
+public:
+	eDVBDBListQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
+	RESULT getNextResult(eServiceReferenceDVB &ref);
+	int compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b);
+};
+
+class eDVBDBSatellitesQuery: public eDVBDBListQuery
+{
+public:
+	eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
+};
+
+class eDVBDBProvidersQuery: public eDVBDBListQuery
+{
+public:
+	eDVBDBProvidersQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
+};
+#endif // SWIG
+
 #endif