X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1aeefd997cc362c3b37c1587c5f08891b35c3a75..208747f6553a9cf68b26860d8c3c4999d180f5fb:/lib/dvb/db.h

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index fe4833cd..795d8702 100644
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -4,25 +4,18 @@
 #include <lib/dvb/idvb.h>
 #include <set>
 
-class eDVBService: public iObject
+class ServiceDescriptionTable;
+
+struct eDVBBouquet
 {
-	DECLARE_REF;
-public:
-	eDVBService();
-	eString m_service_name;
-	eString m_provider_name;
-	
-	int m_flags;
-	std::set<int> m_ca;
-	std::map<int,int> m_cache;
-	virtual ~eDVBService();
+	std::vector<eServiceReferenceDVB> m_services;
+	int lookupService(eServiceReferenceDVB &ref);
 };
 
-class ServiceDescriptionTable;
-
 class eDVBDB: public iDVBChannelList
 {
-DECLARE_REF;
+DECLARE_REF(eDVBDB);
+	friend class eDVBDBQuery;
 private:
 	struct channel
 	{
@@ -32,6 +25,8 @@ private:
 	std::map<eDVBChannelID, channel> m_channels;
 	
 	std::map<eServiceReferenceDVB, ePtr<eDVBService> > m_services;
+	
+	std::map<eServiceReference, eDVBBouquet> m_bouquets;
 public:
 	eDVBDB();
 	virtual ~eDVBDB();
@@ -43,6 +38,22 @@ public:
 	
 	RESULT addService(const eServiceReferenceDVB &service, eDVBService *service);
 	RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service);
+	
+	RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query);
+};
+
+	// we have to add a possibility to invalidate here.
+class eDVBDBQuery: public iDVBChannelListQuery
+{
+DECLARE_REF(eDVBDBQuery);
+private:
+	std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator m_cursor;
+	ePtr<eDVBDB> m_db;
+	ePtr<eDVBChannelQuery> m_query;
+	eServiceReference m_source;
+public:
+	eDVBDBQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
+	virtual RESULT getNextResult(eServiceReferenceDVB &ref);
 };
 
 #endif