X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c20dac16f5ac2de440efdd9ec4a99b58506bbed4..ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 2a3de6a4..dd942490 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 )
@@ -1157,6 +1157,7 @@ int eDVBDBListQuery::compareLessEqual(const eServiceReferenceDVB &a, const eServ
 eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
 	:eDVBDBListQuery(db, source, query)
 {
+	std::set<unsigned int> found;
 	for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
 		it != m_db->m_services.end(); ++it)
 	{
@@ -1164,15 +1165,9 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
 		if (res)
 		{
 			unsigned int dvbnamespace = it->first.getDVBNamespace().get()&0xFFFF0000;
-			bool found=0;
-			for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
-				if ( (i->getDVBNamespace().get()&0xFFFF0000) == dvbnamespace )
-				{
-					found=true;
-					break;
-				}
-			if (!found)
+			if (found.find(dvbnamespace) == found.end())
 			{
+				found.insert(dvbnamespace);
 				eServiceReferenceDVB ref;
 				ref.setDVBNamespace(dvbnamespace);
 				ref.flags=eServiceReference::flagDirectory;
@@ -1209,26 +1204,19 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
 eDVBDBProvidersQuery::eDVBDBProvidersQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
 	:eDVBDBListQuery(db, source, query)
 {
+	std::set<std::string> found;
 	for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
 		it != m_db->m_services.end(); ++it)
 	{
 		int res = it->second->checkFilter(it->first, *query);
 		if (res)
 		{
-			bool found=0;
-
 			const char *provider_name = it->second->m_provider_name.length() ?
 				it->second->m_provider_name.c_str() :
 				"Unknown";
-
-			for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
-				if (i->name == provider_name)
-				{
-					found=true;
-					break;
-				}
-			if (!found)
+			if (found.find(std::string(provider_name)) == found.end())
 			{
+				found.insert(std::string(provider_name));
 				eServiceReferenceDVB ref;
 				char buf[64];
 				ref.name=provider_name;