- added iStaticServiceInformation

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

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index e673b9e68f2444aeb285209cb4c69fffe3ea1319..55998ebfda7ffc4ddc29d1b4672e2ffaddf4c3ec 100644 (file)
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -4,27 +4,12 @@
 #include <lib/dvb/idvb.h>
 #include <set>
 
-class eDVBService: public iObject
-{
-       DECLARE_REF;
-public:
-       eDVBService();
-       std::string m_service_name;
-       std::string m_provider_name;
-       
-       int m_flags;
-       std::set<int> m_ca;
-       std::map<int,int> m_cache;
-       virtual ~eDVBService();
-       
-       eDVBService &operator=(const eDVBService &);
-};
-
 class ServiceDescriptionTable;
 
 class eDVBDB: public iDVBChannelList
 {
 DECLARE_REF;
+       friend class eDVBDBQuery;
 private:
        struct channel
        {
@@ -45,6 +30,21 @@ 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;
+private:
+       std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator m_cursor;
+       ePtr<eDVBDB> m_db;
+       ePtr<eDVBChannelQuery> m_query;
+public:
+       eDVBDBQuery(eDVBDB *db, eDVBChannelQuery *query);
+       virtual RESULT getNextResult(eServiceReferenceDVB &ref);
 };
 
 #endif