X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2e2cf81de863a180f7d27dca89e5122e1eb0acaa..bb92e9d44412e5cf5a735cd15b57b85c338270a6:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 94833f44..77fe3faf 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -66,7 +66,7 @@ RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref
 		return err;
 	}
 
-	const eBouquet *bouquet=0;
+	eBouquet *bouquet=0;
 	if ((err = db->getBouquet(ref, bouquet)) != 0)
 	{
 		eDebug("eStaticServiceDVBBouquetInformation::getName failed.. getBouquet failed!");
@@ -280,10 +280,9 @@ RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
 		if (eDVBResourceManager::getInstance(resm) || resm->getChannelList(db))
 			return -1;
 
-			// FIXME!
-		if (db->getBouquet(m_parent, (const eBouquet*&)m_bouquet) != 0)
+		if (db->getBouquet(m_parent, m_bouquet) != 0)
 			return -1;
-		
+
 		res = this;
 		
 		return 0;
@@ -294,24 +293,30 @@ RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
 
 RESULT eDVBServiceList::addService(eServiceReference &ref)
 {
-	ASSERT(m_bouquet);
-//	return m_bouquet->addService(ref);
-	return -1;
+	if (!m_bouquet)
+		return -1;
+	return m_bouquet->addService(ref);
 }
 
 RESULT eDVBServiceList::removeService(eServiceReference &ref)
 {
-	ASSERT(m_bouquet);
-//	return m_bouquet->removeService(ref);
-	return -1;
+	if (!m_bouquet)
+		return -1;
+	return m_bouquet->removeService(ref);
 }
 
 RESULT eDVBServiceList::moveService(eServiceReference &ref, int pos)
 {
-	ASSERT(m_bouquet);
-	
-//	return m_bouquet->moveService(ref, pos);
-	return -1;
+	if (!m_bouquet)
+		return -1;
+	return m_bouquet->moveService(ref, pos);
+}
+
+RESULT eDVBServiceList::flushChanges()
+{
+	if (!m_bouquet)
+		return -1;
+	return m_bouquet->flushChanges();
 }
 
 RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)