X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/20fc6d7c0f9a9f23217b9562a743ab681cd33f75..23cc33141cdf93dad750965ee559849aa99410a3:/lib/dvb/scan.cpp

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index e1bd0012..d0949a97 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -5,6 +5,8 @@
 #include <dvbsi++/descriptor_tag.h>
 #include <dvbsi++/service_descriptor.h>
 #include <dvbsi++/satellite_delivery_system_descriptor.h>
+#include <dvbsi++/terrestrial_delivery_system_descriptor.h>
+#include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/ca_identifier_descriptor.h>
 #include <lib/dvb/specs.h>
 #include <lib/dvb/esection.h>
@@ -13,6 +15,7 @@
 #include <lib/base/eerror.h>
 #include <lib/base/estring.h>
 #include <errno.h>
+#include <set>
 
 #define SCAN_eDebug(x...) eDebug(x)
 #define SCAN_eDebugNoNewLine(x...) eDebugNoNewLine(x)
@@ -231,7 +234,7 @@ void eDVBScan::addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameter
 		return;
 
 		/* otherwise, add it to the todo list. */
-	m_ch_toScan.push_back(feparm);
+	m_ch_toScan.push_front(feparm); // better.. then the rotor not turning wild from east to west :)
 }
 
 int eDVBScan::sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2) const
@@ -285,20 +288,43 @@ void eDVBScan::channelDone()
 				{
 					switch ((*desc)->getTag())
 					{
-//					case SERVICE_LIST_DESCRIPTOR:
+					case CABLE_DELIVERY_SYSTEM_DESCRIPTOR:
+					{
+						CableDeliverySystemDescriptor &d = (CableDeliverySystemDescriptor&)**desc;
+						ePtr<eDVBFrontendParameters> feparm = new eDVBFrontendParameters;
+						eDVBFrontendParametersCable cable;
+						cable.set(d);
+						feparm->setDVBC(cable);
+
+						unsigned long hash=0;
+						feparm->getHash(hash);
+						eDVBNamespace ns = buildNamespace(onid, tsid, hash);
+
+						addChannelToScan(
+							eDVBChannelID(ns, tsid, onid),
+							feparm);
+						break;
+					}
+					case TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR:
+					{
+						TerrestrialDeliverySystemDescriptor &d = (TerrestrialDeliverySystemDescriptor&)**desc;
+						ePtr<eDVBFrontendParameters> feparm = new eDVBFrontendParameters;
+						eDVBFrontendParametersTerrestrial terr;
+						terr.set(d);
+						feparm->setDVBT(terr);
+
+						unsigned long hash=0;
+						feparm->getHash(hash);
+						eDVBNamespace ns = buildNamespace(onid, tsid, hash);
+
+						addChannelToScan(
+							eDVBChannelID(ns, tsid, onid),
+							feparm);
+						break;
+					}
 					case SATELLITE_DELIVERY_SYSTEM_DESCRIPTOR:
 					{
 						SatelliteDeliverySystemDescriptor &d = (SatelliteDeliverySystemDescriptor&)**desc;
-						SCAN_eDebug("%d kHz, %d%d%d.%d%c %s MOD:%d %d symb/s, fec %d", 
-								d.getFrequency(), 
-								(d.getOrbitalPosition()>>12)&0xF,
-								(d.getOrbitalPosition()>>8)&0xF,
-								(d.getOrbitalPosition()>>4)&0xF,
-								d.getOrbitalPosition()&0xF, d.getWestEastFlag()?'E':'W',
-								d.getPolarization() ? "hor" : "vert",
-								d.getModulation(), d.getSymbolRate(), d.getFecInner());
-						
-							/* some sanity checking: below 100MHz is invalid */
 						if (d.getFrequency() < 10000)
 							break;
 						
@@ -375,6 +401,7 @@ void eDVBScan::start(const eSmartPtrList<iDVBFrontendParameters> &known_transpon
 	m_ch_unavailable.clear();
 	m_new_channels.clear();
 	m_new_services.clear();
+	m_last_service = m_new_services.end();
 
 	for (eSmartPtrList<iDVBFrontendParameters>::const_iterator i(known_transponders.begin()); i != known_transponders.end(); ++i)
 	{
@@ -396,6 +423,87 @@ void eDVBScan::start(const eSmartPtrList<iDVBFrontendParameters> &known_transpon
 
 void eDVBScan::insertInto(iDVBChannelList *db)
 {
+	if (m_flags & scanRemoveServices)
+	{
+		bool clearTerrestrial=false;
+		bool clearCable=false;
+		std::set<unsigned int> scanned_sat_positions;
+		
+		std::list<ePtr<iDVBFrontendParameters> >::iterator it(m_ch_scanned.begin());
+		for (;it != m_ch_scanned.end(); ++it)
+		{
+			int system;
+			(*it)->getSystem(system);
+			switch(system)
+			{
+				case iDVBFrontend::feSatellite:
+				{
+					eDVBFrontendParametersSatellite sat_parm;
+					(*it)->getDVBS(sat_parm);
+					scanned_sat_positions.insert(sat_parm.orbital_position);
+					break;
+				}
+				case iDVBFrontend::feTerrestrial:
+				{
+					clearTerrestrial=true;
+					break;
+				}
+				case iDVBFrontend::feCable:
+				{
+					clearCable=true;
+					break;
+				}
+			}
+		}
+
+		for (it=m_ch_unavailable.begin();it != m_ch_unavailable.end(); ++it)
+		{
+			int system;
+			(*it)->getSystem(system);
+			switch(system)
+			{
+				case iDVBFrontend::feSatellite:
+				{
+					eDVBFrontendParametersSatellite sat_parm;
+					(*it)->getDVBS(sat_parm);
+					scanned_sat_positions.insert(sat_parm.orbital_position);
+					break;
+				}
+				case iDVBFrontend::feTerrestrial:
+				{
+					clearTerrestrial=true;
+					break;
+				}
+				case iDVBFrontend::feCable:
+				{
+					clearCable=true;
+					break;
+				}
+			}
+		}
+
+		if (clearTerrestrial)
+		{
+			eDVBChannelID chid;
+			chid.dvbnamespace=0xEEEE0000;
+			db->removeServices(chid);
+		}
+		if (clearCable)
+		{
+			eDVBChannelID chid;
+			chid.dvbnamespace=0xFFFF0000;
+			db->removeServices(chid);
+		}
+		for (std::set<unsigned int>::iterator x(scanned_sat_positions.begin()); x != scanned_sat_positions.end(); ++x)
+		{
+			eDVBChannelID chid;
+			if (m_flags & scanDontRemoveFeeds)
+				chid.dvbnamespace = eDVBNamespace((*x)<<16);
+			eDebug("remove %d %08x", *x, chid.dvbnamespace.get());
+			db->removeServices(chid, *x);
+		}
+	}
+
 	for (std::map<eDVBChannelID, ePtr<iDVBFrontendParameters> >::const_iterator 
 			ch(m_new_channels.begin()); ch != m_new_channels.end(); ++ch)
 		db->addChannelToList(ch->first, ch->second);
@@ -404,9 +512,15 @@ void eDVBScan::insertInto(iDVBChannelList *db)
 	{
 		ePtr<eDVBService> dvb_service;
 		if (!db->getService(service->first, dvb_service))
+		{
 			*dvb_service = *service->second;
+			dvb_service->m_flags &= ~eDVBService::dxNewFound;
+		}
 		else
+		{
 			db->addService(service->first, service->second);
+			service->second->m_flags |= eDVBService::dxNewFound;
+		}
 	}
 }
 
@@ -469,7 +583,13 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription
 			}
 		}
 		
-		m_new_services.insert(std::pair<eServiceReferenceDVB, ePtr<eDVBService> >(ref, service));		
+		std::pair<std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator, bool> i = m_new_services.insert(std::pair<eServiceReferenceDVB, ePtr<eDVBService> >(ref, service));
+		
+		if (i.second)
+		{
+			m_last_service = i.first;
+			m_event(evtNewService);
+		}
 	}
 	return 0;
 }
@@ -486,3 +606,11 @@ void eDVBScan::getStats(int &transponders_done, int &transponders_total, int &se
 	transponders_total = m_ch_toScan.size() + transponders_done;
 	services = m_new_services.size();
 }
+
+void eDVBScan::getLastServiceName(std::string &last_service_name)
+{
+	if (m_last_service == m_new_services.end())
+		last_service_name = "";
+	else
+		last_service_name = m_last_service->second->m_service_name;
+}