X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/75db34c299094d2ae87941ed464e8efa79848e16..6aa0ed7fff929c4b2651667ab809d0ace1dac56d:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index a9f58c0f..52920473 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -12,13 +12,19 @@
 
 DEFINE_REF(eDVBService);
 
-RESULT eBouquet::addService(const eServiceReference &ref)
+RESULT eBouquet::addService(const eServiceReference &ref, eServiceReference before)
 {
 	list::iterator it =
 		std::find(m_services.begin(), m_services.end(), ref);
 	if ( it != m_services.end() )
 		return -1;
-	m_services.push_back(ref);
+	if (before.valid())
+	{
+		it = std::find(m_services.begin(), m_services.end(), before);
+		m_services.insert(it, ref);
+	}
+	else
+		m_services.push_back(ref);
 	return 0;
 }
 
@@ -450,7 +456,7 @@ void eDVBDB::reloadServicelist()
 				{
 					int cid, val;
 					sscanf(v.c_str(), "%02d%04x", &cid, &val);
-					s->setCacheEntry(cid,val);
+					s->setCacheEntry((eDVBService::cacheID)cid,val);
 				} else if (p == 'C')
 				{
 					int val;
@@ -542,7 +548,7 @@ void eDVBDB::saveServicelist()
 		// write cached pids
 		for (int x=0; x < eDVBService::cacheMax; ++x)
 		{
-			int entry = i->second->getCacheEntry(x);
+			int entry = i->second->getCacheEntry((eDVBService::cacheID)x);
 			if (entry != -1)
 				fprintf(f, ",c:%02d%04x", x, entry);
 		}
@@ -1009,21 +1015,43 @@ eDVBDBQueryBase::eDVBDBQueryBase(eDVBDB *db, const eServiceReference &source, eD
 int eDVBDBQueryBase::compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b)
 {
 	ePtr<eDVBService> a_service, b_service;
-	
 	int sortmode = m_query ? m_query->m_sort : eDVBChannelQuery::tName;
 	
 	if ((sortmode == eDVBChannelQuery::tName) || (sortmode == eDVBChannelQuery::tProvider))
 	{
-		if (m_db->getService(a, a_service))
+		if (a.name.empty() && m_db->getService(a, a_service))
 			return 1;
-		if (m_db->getService(b, b_service))
+		if (b.name.empty() && m_db->getService(b, b_service))
 			return 1;
 	}
 	
 	switch (sortmode)
 	{
 	case eDVBChannelQuery::tName:
-		return a_service->m_service_name_sort < b_service->m_service_name_sort;
+		if (a_service)
+		{
+			if (b_service)
+				return a_service->m_service_name_sort < b_service->m_service_name_sort;
+			else
+			{
+				std::string str = b.name;
+				makeUpper(str);
+				return a_service->m_service_name_sort < str;
+			}
+		}
+		else if (b_service)
+		{
+			std::string str = a.name;
+			makeUpper(str);
+			return str < b_service->m_service_name_sort;
+		}
+		else
+		{
+			std::string aa = a.name, bb = b.name;
+			makeUpper(aa);
+			makeUpper(bb);
+			return aa < bb;
+		}
 	case eDVBChannelQuery::tProvider:
 		return a_service->m_provider_name < b_service->m_provider_name;
 	case eDVBChannelQuery::tType:
@@ -1120,7 +1148,10 @@ int eDVBDBListQuery::compareLessEqual(const eServiceReferenceDVB &a, const eServ
 			y -= 3600;
 		return x < y;
 	}
-	return a.name < b.name;
+	std::string aa = a.name, bb = b.name;
+	makeUpper(aa);
+	makeUpper(bb);
+	return aa < bb;
 }
 
 eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)