code cleanup/optimization

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

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 604d5288c1a3e81f17aa528dc80778ef37f70448..c5e3ff5c7cc1bc567cd506389e4c47a1e54ce7a8 100644 (file)
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -1,21 +1,17 @@
 #ifndef __db_h
 #define __db_h
 
+#include <lib/base/eptrlist.h>
 #include <lib/dvb/idvb.h>
 #include <set>
 
 class ServiceDescriptionSection;
 
-struct eDVBBouquet
-{
-       std::vector<eServiceReferenceDVB> m_services;
-       int lookupService(eServiceReferenceDVB &ref);
-};
-
 class eDVBDB: public iDVBChannelList
 {
 DECLARE_REF(eDVBDB);
        friend class eDVBDBQuery;
+       friend class eDVBDBBouquetQuery;
 private:
        struct channel
        {
@@ -26,10 +22,14 @@ private:
        
        std::map<eServiceReferenceDVB, ePtr<eDVBService> > m_services;
        
-       std::map<eServiceReference, eDVBBouquet> m_bouquets;
+       std::map<std::string, eBouquet> m_bouquets;
 public:
        void load();
        void save();
+
+       void loadBouquet(const char *path);
+       void loadBouquets();
+
        eDVBDB();
        virtual ~eDVBDB();
        
@@ -40,24 +40,41 @@ public:
        
        RESULT addService(const eServiceReferenceDVB &service, eDVBService *service);
        RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service);
-       
-       RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query);
+       RESULT flush();
+
+       RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source);
+
+       RESULT getBouquet(const eServiceReference &ref, eBouquet* &bouquet);
 };
 
        // we have to add a possibility to invalidate here.
-class eDVBDBQuery: public iDVBChannelListQuery
+class eDVBDBQueryBase: public iDVBChannelListQuery
 {
-DECLARE_REF(eDVBDBQuery);
-private:
+DECLARE_REF(eDVBDBQueryBase);
+protected:
        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);
-       
+       eDVBDBQueryBase(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
        int compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b);
 };
 
+class eDVBDBQuery: public eDVBDBQueryBase
+{
+       std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator m_cursor;
+public:
+       eDVBDBQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
+       RESULT getNextResult(eServiceReferenceDVB &ref);
+};
+
+class eDVBDBBouquetQuery: public eDVBDBQueryBase
+{
+       std::list<eServiceReference>::iterator m_cursor;
+public:
+       eDVBDBBouquetQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
+       RESULT getNextResult(eServiceReferenceDVB &ref);
+};
+
 #endif