X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicedvb.cpp;h=b1c18a1d719360311ad8b1ac591e2f68d62c6426;hp=94833f446f75d7a3a55d768156a8e40c8a0064df;hb=a6d3a3d2a552e2846e8da5a03f7651c5c2e7d6b2;hpb=de0f72b065f83042e6933b63487eb8124e643990

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 94833f4..b1c18a1 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,23 @@ 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 eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)