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

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index e1bd0012..e722b3c5 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>
@@ -231,7 +233,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 +287,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 +400,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)
 	{
@@ -469,7 +495,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 +518,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;
+}