- improved parser

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

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 763df7eb6bd2a135995d25017d52ae2848334897..7e31a22dceabac2465f235ef4664d2fe59f06e4a 100644 (file)
--- 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 virtual iDVBChannelList
+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;
+       eServiceReferenceDVB m_source;
+public:
+       eDVBDBQuery(eDVBDB *db, const eServiceReferenceDVB &source, eDVBChannelQuery *query);
+       virtual RESULT getNextResult(eServiceReferenceDVB &ref);
 };
 
 #endif