X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5824a5dd33390117c70ff1cdfdf76afaaaac71ac..7562262ab3b7b72fa9ed1d73c8db38ccc0b8c2c6:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index eb0221a3..31b70882 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -81,7 +81,7 @@ RESULT eBouquet::flushChanges()
 	{
 		eServiceReference tmp = *i;
 		std::string str = tmp.path;
-		if ( (i->flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+		if ( i->flags&eServiceReference::canDescent )
 		{
 			unsigned int p1 = str.find("FROM BOUQUET \"");
 			if (p1 == std::string::npos)
@@ -168,7 +168,7 @@ RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &
 	return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
 }
 
-bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+int eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
 {
 	ePtr<eDVBResourceManager> res_mgr;
 	if ( eDVBResourceManager::getInstance( res_mgr ) )
@@ -180,7 +180,7 @@ bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReferen
 		((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
 		return res_mgr->canAllocateChannel(chid, chid_ignore);
 	}
-	return false;
+	return 0;
 }
 
 int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
@@ -642,7 +642,7 @@ void eDVBDB::loadBouquet(const char *path)
 					eDebug("only DVB Bouquets supported");
 					continue;
 				}
-				if ( (tmp.flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+				if ( tmp.flags&eServiceReference::canDescent )
 				{
 					unsigned int pos = tmp.path.rfind('/');
 					if ( pos != std::string::npos )
@@ -763,7 +763,7 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos)
 		bool remove=true;
 		int system;
 		it->second.m_frontendParameters->getSystem(system);
-		if ( orbpos != 0xFFFFFFFF && system == iDVBFrontend::feSatellite )
+		if ( system == iDVBFrontend::feSatellite )
 		{
 			eDVBFrontendParametersSatellite sat;
 			it->second.m_frontendParameters->getDVBS(sat);