X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ee34a458cc9a6decd919186367324543fc71e509..6f50f87ade33d60f05939a38de1ae0f4117b414b:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index b40b7373..9035b8f0 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -260,12 +260,17 @@ void eDVBService::setCacheEntry(cacheID id, int pid)
 
 DEFINE_REF(eDVBDB);
 
-	/* THIS CODE IS BAD. it should be replaced by somethine better. */
 void eDVBDB::reloadServicelist()
+{
+	loadServicelist(CONFIGDIR"/enigma2/lamedb");
+}
+
+	/* THIS CODE IS BAD. it should be replaced by somethine better. */
+void eDVBDB::loadServicelist(const char *file)
 {
 	eDebug("---- opening lame channel db");
-	FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "rt");
-	if (!f)
+	FILE *f=fopen(file, "rt");
+	if (!f && strcmp(file, CONFIGDIR"/enigma2/lamedb") == 0)
 	{
 		struct stat s;
 		if ( !stat("lamedb", &s) )
@@ -322,8 +327,9 @@ void eDVBDB::reloadServicelist()
 				int frequency, symbol_rate, polarisation, fec, orbital_position, inversion,
 					system=eDVBFrontendParametersSatellite::System::DVB_S,
 					modulation=eDVBFrontendParametersSatellite::Modulation::QPSK,
-					rolloff=eDVBFrontendParametersSatellite::RollOff::alpha_auto;
-				sscanf(line+3, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &system, &modulation, &rolloff);
+					rolloff=eDVBFrontendParametersSatellite::RollOff::alpha_0_35,
+					pilot=eDVBFrontendParametersSatellite::Pilot::Unknown;
+				sscanf(line+3, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &system, &modulation, &rolloff, &pilot);
 				sat.frequency = frequency;
 				sat.symbol_rate = symbol_rate;
 				sat.polarisation = polarisation;
@@ -333,7 +339,8 @@ void eDVBDB::reloadServicelist()
 				sat.inversion = inversion;
 				sat.system = system;
 				sat.modulation = modulation;
-				sat.roll_off = rolloff;
+				sat.rolloff = rolloff;
+				sat.pilot = pilot;
 				feparm->setDVBS(sat);
 			} else if (line[1]=='t')
 			{
@@ -455,10 +462,10 @@ void eDVBDB::reloadServicelist()
 	fclose(f);
 }
 
-void eDVBDB::saveServicelist()
+void eDVBDB::saveServicelist(const char *file)
 {
 	eDebug("---- saving lame channel db");
-	FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "w");
+	FILE *f=fopen(file, "w");
 	int channels=0, services=0;
 	if (!f)
 		eFatal("couldn't save lame channel db!");
@@ -479,14 +486,18 @@ void eDVBDB::saveServicelist()
 		{
 			if (sat.system == eDVBFrontendParametersSatellite::System::DVB_S2)
 			{
-				fprintf(f, "\ts %d:%d:%d:%d:%d:%d:%d:%d:%d\n",
+				fprintf(f, "\ts %d:%d:%d:%d:%d:%d:%d:%d:%d",
 					sat.frequency, sat.symbol_rate,
 					sat.polarisation, sat.fec,
 					sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position,
 					sat.inversion,
 					sat.system,
 					sat.modulation,
-					sat.roll_off);
+					sat.rolloff);
+				if (sat.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK)
+					fprintf(f, ":%d\n", sat.pilot);
+				else
+					fprintf(f, "\n");
 			}
 			else
 			{
@@ -552,6 +563,11 @@ void eDVBDB::saveServicelist()
 	fclose(f);
 }
 
+void eDVBDB::saveServicelist()
+{
+	saveServicelist(CONFIGDIR"/enigma2/lamedb");
+}
+
 void eDVBDB::loadBouquet(const char *path)
 {
 	std::string bouquet_name = path;
@@ -761,7 +777,7 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 		return Py_False;
 	}
 	int tmp, *dest = NULL,
-		modulation, system, freq, sr, pol, fec;
+		modulation, system, freq, sr, pol, fec, inv, pilot, rolloff;
 	char *end_ptr;
 	const Attribute *at;
 	std::string name;
@@ -823,6 +839,9 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 				sr = 0;
 				pol = -1;
 				fec = 0; // AUTO default
+				inv = 2; // AUTO default
+				pilot = 2; // AUTO default
+				rolloff = 0; // alpha 0.35
 				for (AttributeConstIterator it(tp_attributes.begin()); it != end; ++it)
 				{
 //					eDebug("\t\tattr: %s", at->name().c_str());
@@ -834,6 +853,9 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 					else if (name == "symbol_rate") dest = &sr;
 					else if (name == "polarization") dest = &pol;
 					else if (name == "fec_inner") dest = &fec;
+					else if (name == "inversion") dest = &inv;
+					else if (name == "rolloff") dest = &rolloff;
+					else if (name == "pilot") dest = &pilot;
 					if (dest)
 					{
 						tmp = strtol(at->value().c_str(), &end_ptr, 10);
@@ -843,7 +865,7 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 				}
 				if (freq && sr && pol != -1)
 				{
-					tuple = PyTuple_New(7);
+					tuple = PyTuple_New(10);
 					PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(0));
 					PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(freq));
 					PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(sr));
@@ -851,6 +873,9 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 					PyTuple_SET_ITEM(tuple, 4, PyInt_FromLong(fec));
 					PyTuple_SET_ITEM(tuple, 5, PyInt_FromLong(system));
 					PyTuple_SET_ITEM(tuple, 6, PyInt_FromLong(modulation));
+					PyTuple_SET_ITEM(tuple, 7, PyInt_FromLong(inv));
+					PyTuple_SET_ITEM(tuple, 8, PyInt_FromLong(rolloff));
+					PyTuple_SET_ITEM(tuple, 9, PyInt_FromLong(pilot));
 					PyList_Append(tplist, tuple);
 					Py_DECREF(tuple);
 				}
@@ -863,6 +888,8 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 				Py_DECREF(sat_pos);
 			if (sat_name)
 				Py_DECREF(sat_name);
+			if (sat_flags)
+				Py_DECREF(sat_flags);
 		}
 	}
 	Py_INCREF(Py_True);
@@ -1158,10 +1185,15 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos)
 			if ((unsigned int)sat.orbital_position != orbpos)
 				remove=false;
 		}
-		else if (orbpos != 0xFFFFFFFF) // do not remove -C or -T transponders when a orbital position is given..
-			remove=false;
-		if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
-			remove=false;
+		if ( remove && chid.dvbnamespace != eNs )
+		{
+			if (system == iDVBFrontend::feCable && chid.dvbnamespace.get() == (int)0xFFFF0000)
+				;
+			else if (system == iDVBFrontend::feTerrestrial && chid.dvbnamespace.get() == (int)0xEEEE0000)
+				;
+			else if ( chid.dvbnamespace != ch.dvbnamespace )
+				remove=false;
+		}
 		if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )
 			remove=false;
 		if ( remove && chid.transport_stream_id != eTsid && chid.transport_stream_id != ch.transport_stream_id )
@@ -1247,8 +1279,15 @@ RESULT eDVBDB::removeFlags(unsigned int flagmask, eDVBChannelID chid, unsigned i
 			if ((unsigned int)sat.orbital_position != orbpos)
 				remove=false;
 		}
-		if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
-			remove=false;
+		if ( remove && chid.dvbnamespace != eNs )
+		{
+			if (system == iDVBFrontend::feCable && chid.dvbnamespace.get() == (int)0xFFFF0000)
+				;
+			else if (system == iDVBFrontend::feTerrestrial && chid.dvbnamespace.get() == (int)0xEEEE0000)
+				;
+			else if ( chid.dvbnamespace != ch.dvbnamespace )
+				remove=false;
+		}
 		if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )
 			remove=false;
 		if ( remove && chid.transport_stream_id != eTsid && chid.transport_stream_id != ch.transport_stream_id )
@@ -1466,14 +1505,20 @@ RESULT eDVBDBQuery::getNextResult(eServiceReferenceDVB &ref)
 {
 	while (m_cursor != m_db->m_services.end())
 	{
-		ref = m_cursor->first;
+		ePtr<eDVBService> service = m_cursor->second;
+		if (service->isHidden())
+			++m_cursor;
+		else
+		{
+			ref = m_cursor->first;
 
-		int res = (!m_query) || m_cursor->second->checkFilter(ref, *m_query);
+			int res = (!m_query) || service->checkFilter(ref, *m_query);
 
-		++m_cursor;
+			++m_cursor;
 
-		if (res)
-			return 0;
+			if (res)
+				return 0;
+		}
 	}
 
 	ref.type = eServiceReference::idInvalid;
@@ -1497,7 +1542,7 @@ RESULT eDVBDBBouquetQuery::getNextResult(eServiceReferenceDVB &ref)
 		std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it =
 			m_db->m_services.find(ref);
 
-		int res = (!m_query) || it == m_db->m_services.end() || it->second->checkFilter(ref, *m_query);
+		int res = (!m_query) || it == m_db->m_services.end() || !(it->second->isHidden() && it->second->checkFilter(ref, *m_query));
 
 		++m_cursor;
 
@@ -1551,7 +1596,7 @@ eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference
 	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);
+		int res = !it->second->isHidden() && it->second->checkFilter(it->first, *query);
 		if (res)
 		{
 			unsigned int dvbnamespace = it->first.getDVBNamespace().get()&0xFFFF0000;
@@ -1598,7 +1643,7 @@ eDVBDBProvidersQuery::eDVBDBProvidersQuery(eDVBDB *db, const eServiceReference &
 	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);
+		int res = !it->second->isHidden() && it->second->checkFilter(it->first, *query);
 		if (res)
 		{
 			const char *provider_name = it->second->m_provider_name.length() ?