X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3af66122574386a2856e83ba9c5d73d27a6f3710..9a236ba05f412b3f6853f54c5665cf0e5398d7d3:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 4e0332ba..cdc05fcb 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -30,6 +30,7 @@ eDVBService &eDVBService::operator=(const eDVBService &s)
 RESULT eDVBService::getName(const eServiceReference &ref, std::string &name)
 {
 	name = m_service_name;
+	return 0;
 }
 
 int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
@@ -330,14 +331,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 +488,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());