- fixed filter source (not yet fully implemented anyway)

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 4e0332b..fb41df9 100644 (file)
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -330,14 +330,15 @@ RESULT eDVBDB::getService(const eServiceReferenceDVB &reference, ePtr<eDVBServic
 
 RESULT eDVBDB::startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q)
 {
-       query = new eDVBDBQuery(this, q);
+       query = new eDVBDBQuery(this, eServiceReference(), q);
        return 0;
 }
 
 DEFINE_REF(eDVBDBQuery);
 
-eDVBDBQuery::eDVBDBQuery(eDVBDB *db, eDVBChannelQuery *query): m_db(db), m_query(query)
+eDVBDBQuery::eDVBDBQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query): m_db(db), m_query(query)
 {
+               // TODO: use SOURCE ...
        m_cursor = m_db->m_services.begin();
 }
 
@@ -486,12 +487,10 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
        return 0;
 }
 
-RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, const eServiceReferenceDVB &source, std::string query)
+RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 {
        std::list<std::string> tokens;
        
-       m_source = source;
-       
        std::string current_token;
        
 //     eDebug("splitting %s....", query.c_str());

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 7e31a22..795d870 100644 (file)
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -50,9 +50,9 @@ private:
        std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator m_cursor;
        ePtr<eDVBDB> m_db;
        ePtr<eDVBChannelQuery> m_query;
-       eServiceReferenceDVB m_source;
+       eServiceReference m_source;
 public:
-       eDVBDBQuery(eDVBDB *db, const eServiceReferenceDVB &source, eDVBChannelQuery *query);
+       eDVBDBQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query);
        virtual RESULT getNextResult(eServiceReferenceDVB &ref);
 };