- fixed filter source (not yet fully implemented anyway)

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

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 55998ebfda7ffc4ddc29d1b4672e2ffaddf4c3ec..795d870283bca8827a52aa6a870bd0e3b394d1d9 100644 (file)
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -6,9 +6,15 @@
 
 class ServiceDescriptionTable;
 
+struct eDVBBouquet
+{
+       std::vector<eServiceReferenceDVB> m_services;
+       int lookupService(eServiceReferenceDVB &ref);
+};
+
 class eDVBDB: public iDVBChannelList
 {
-DECLARE_REF;
+DECLARE_REF(eDVBDB);
        friend class eDVBDBQuery;
 private:
        struct channel
@@ -19,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();
@@ -30,20 +38,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;
+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, eDVBChannelQuery *query);
+       eDVBDBQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
        virtual RESULT getNextResult(eServiceReferenceDVB &ref);
 };