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

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index c5e3ff5c..8bb0e5ae 100644
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -12,6 +12,8 @@ class eDVBDB: public iDVBChannelList
 DECLARE_REF(eDVBDB);
 	friend class eDVBDBQuery;
 	friend class eDVBDBBouquetQuery;
+	friend class eDVBDBSatellitesQuery;
+	friend class eDVBDBProvidersQuery;
 private:
 	struct channel
 	{
@@ -52,13 +54,12 @@ 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 +78,27 @@ 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