X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/089df6a2a17ec560a9c525857b4bbe43442b5ca8..d73219bf587818d7648531da574beb45f6e3c000:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 3920053d..2fbe53e6 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -107,7 +107,14 @@ err:
 	return -1;
 }
 
+RESULT eBouquet::setListName(const std::string &name)
+{
+	m_bouquet_name = name;
+	return 0;
+}
+
 eDVBService::eDVBService()
+	:m_flags(0)
 {
 }
 
@@ -187,7 +194,7 @@ int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQ
 		res = 0;
 		break;
 	case eDVBChannelQuery::tSatellitePosition:
-		res = (ref.getDVBNamespace().get() >> 16) == query.m_int;
+		res = ((unsigned int)ref.getDVBNamespace().get())>>16 == query.m_int;
 		break;
 	case eDVBChannelQuery::tChannelID:
 	{
@@ -202,6 +209,9 @@ int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQ
 	case eDVBChannelQuery::tOR:
 		res = checkFilter(ref, *query.m_p1) || checkFilter(ref, *query.m_p2);
 		break;
+	case eDVBChannelQuery::tAny:
+		res = 1;
+		break;
 	}
 
 	if (query.m_inverse)
@@ -229,7 +239,7 @@ void eDVBService::setCachePID(cacheID id, int pid)
 DEFINE_REF(eDVBDB);
 
 	/* THIS CODE IS BAD. it should be replaced by somethine better. */
-void eDVBDB::load()
+void eDVBDB::reloadServicelist()
 {
 	eDebug("---- opening lame channel db");
 	FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "rt");
@@ -238,8 +248,11 @@ void eDVBDB::load()
 		struct stat s;
 		if ( !stat("lamedb", &s) )
 		{
-			rename("lamedb", CONFIGDIR"/enigma2/lamedb" );
-			load();
+			if ( !stat(CONFIGDIR"/enigma2", &s) )
+			{
+				rename("lamedb", CONFIGDIR"/enigma2/lamedb" );
+				reloadServicelist();
+			}
 		}
 		return;
 	}
@@ -308,13 +321,21 @@ void eDVBDB::load()
 				ter.guard_interval = guard_interval;
 				ter.hierarchy = hierarchy;
 				ter.inversion = inversion;
-
 				feparm->setDVBT(ter);
 			} else if (line[1]=='c')
 			{
-				int frequency, symbol_rate, inversion=0, modulation=3;
-				sscanf(line+2, "%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation);
-//				t.setCable(frequency, symbol_rate, inversion, modulation);
+				eDVBFrontendParametersCable cab;
+				int frequency, symbol_rate,
+					inversion=eDVBFrontendParametersCable::Inversion::Unknown,
+					modulation=eDVBFrontendParametersCable::Modulation::Auto,
+					fec_inner=eDVBFrontendParametersCable::FEC::fAuto;
+				sscanf(line+2, "%d:%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation, &fec_inner);
+				cab.frequency = frequency;
+				cab.fec_inner = fec_inner;
+				cab.inversion = inversion;
+				cab.symbol_rate = symbol_rate;
+				cab.modulation = modulation;
+				feparm->setDVBC(cab);
 			}
 		}
 		addChannelToList(channelid, feparm);
@@ -406,7 +427,7 @@ void eDVBDB::load()
 	fclose(f);
 }
 
-void eDVBDB::save()
+void eDVBDB::saveServicelist()
 {
 	eDebug("---- saving lame channel db");
 	FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "w");
@@ -425,6 +446,7 @@ void eDVBDB::save()
 				chid.transport_stream_id.get(), chid.original_network_id.get());
 		eDVBFrontendParametersSatellite sat;
 		eDVBFrontendParametersTerrestrial ter;
+		eDVBFrontendParametersCable cab;
 		if (!ch.m_frontendParameters->getDVBS(sat))
 		{
 			fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n",
@@ -440,6 +462,11 @@ void eDVBDB::save()
 				ter.code_rate_LP, ter.modulation, ter.transmission_mode,
 				ter.guard_interval, ter.hierarchy, ter.inversion);
 		}
+		if (!ch.m_frontendParameters->getDVBC(cab))
+		{
+			fprintf(f, "\tc %d:%d:%d:%d:%d\n",
+				cab.frequency, cab.symbol_rate, cab.inversion, cab.modulation, cab.fec_inner);
+		}
 		fprintf(f, "/\n");
 		channels++;
 	}
@@ -456,6 +483,7 @@ void eDVBDB::save()
 				0);
 
 		fprintf(f, "%s\n", i->second->m_service_name.c_str());
+
 		fprintf(f, "p:%s", i->second->m_provider_name.c_str());
 
 		// write cached pids
@@ -468,6 +496,9 @@ void eDVBDB::save()
 			ca != i->second->m_ca.end(); ++ca)
 			fprintf(f, ",C:%04x", *ca);
 
+		if (i->second->m_flags)
+			fprintf(f, ",f:%x", i->second->m_flags);
+
 		fprintf(f, "\n");
 		services++;
 	}
@@ -583,8 +614,9 @@ void eDVBDB::loadBouquet(const char *path)
 	eDebug("%d entries in Bouquet %s", entries, bouquet_name.c_str());
 }
 
-void eDVBDB::loadBouquets()
+void eDVBDB::reloadBouquets()
 {
+	m_bouquets.clear();
 	loadBouquet("bouquets.tv");
 	loadBouquet("bouquets.radio");
 // create default bouquets when missing
@@ -614,7 +646,7 @@ void eDVBDB::loadBouquets()
 		memset(ref.data, 0, sizeof(ref.data));
 		ref.type=1;
 		ref.flags=7;
-		ref.data[0]=1;
+		ref.data[0]=2;
 		ref.path="(type == 2) FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
 		eBouquet &parent = m_bouquets["bouquets.radio"];
 		parent.m_services.push_back(ref);
@@ -622,15 +654,17 @@ void eDVBDB::loadBouquets()
 	}
 }
 
+eDVBDB *eDVBDB::instance;
+
 eDVBDB::eDVBDB()
 {
-	load();
-	loadBouquets();
+	instance = this;
+	reloadServicelist();
 }
 
 eDVBDB::~eDVBDB()
 {
-//	save();
+	instance=NULL;
 }
 
 RESULT eDVBDB::addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)
@@ -681,7 +715,7 @@ RESULT eDVBDB::getService(const eServiceReferenceDVB &reference, ePtr<eDVBServic
 
 RESULT eDVBDB::flush()
 {
-	save();
+	saveServicelist();
 	return 0;
 }
 
@@ -737,6 +771,22 @@ RESULT eDVBDB::startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q
 	return 0;
 }
 
+eServiceReference eDVBDB::searchReference(int tsid, int onid, int sid)
+{
+	eServiceID Sid(sid);
+	eTransportStreamID Tsid(tsid);
+	eOriginalNetworkID Onid(onid);
+	for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator sit(m_services.begin());
+		sit != m_services.end(); ++sit)
+	{
+		if (sit->first.getTransportStreamID() == Tsid &&
+			sit->first.getOriginalNetworkID() == Onid &&
+			sit->first.getServiceID() == Sid)
+			return sit->first;
+	}
+	return eServiceReference();
+}
+
 DEFINE_REF(eDVBDBQueryBase);
 
 eDVBDBQueryBase::eDVBDBQueryBase(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
@@ -969,6 +1019,13 @@ static int decodeType(const std::string &type)
 RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::const_iterator begin, std::list<std::string>::const_iterator end)
 {
 	std::list<std::string>::const_iterator end_of_exp;
+	
+	if (begin == end)
+	{
+		eDebug("empty expression!");
+		return 0;
+	}
+	
 	if (*begin == "(")
 	{
 		end_of_exp = begin;
@@ -1185,6 +1242,14 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 		/* now we recursivly parse that. */
 	int r = parseExpression(res, tokens.begin(), tokens.end());
 	
+		/* we have an empty (but valid!) expression */
+	if (!r && !res)
+	{
+		res = new eDVBChannelQuery();
+		res->m_inverse = 0;
+		res->m_type = eDVBChannelQuery::tAny;
+	}
+	
 	if (res)
 	{
 		res->m_sort = sort;