X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a2eb4cb31c5df65b943b68a9aa0a376655631143..6be1d64932f7007baa7974f72724a97dd6c7304e:/lib/dvb/scan.cpp

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index f9d7547e..f49607c2 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -157,7 +157,7 @@ RESULT eDVBScan::startFilter()
 	if (startSDT && (m_ready_all & readySDT))
 	{
 		m_SDT = new eTable<ServiceDescriptionSection>();
-		if (m_ready & readyPAT)
+		if (m_ready & readyPAT && m_ready & validPAT)
 		{
 			std::vector<ProgramAssociationSection*>::const_iterator i =
 				m_PAT->getSections().begin();
@@ -250,34 +250,80 @@ void eDVBScan::addKnownGoodChannel(const eDVBChannelID &chid, iDVBFrontendParame
 void eDVBScan::addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameters *feparm)
 {
 		/* check if we don't already have that channel ... */
-		
+
+	int type;
+	feparm->getSystem(type);
+
+	switch(type)
+	{
+	case iDVBFrontend::feSatellite:
+	{
+		eDVBFrontendParametersSatellite parm;
+		feparm->getDVBS(parm);
+		eDebug("try to add %d %d %d %d %d %d",
+			parm.orbital_position, parm.frequency, parm.symbol_rate, parm.polarisation, parm.fec, parm.modulation);
+		break;
+	}
+	case iDVBFrontend::feCable:
+	{
+		eDVBFrontendParametersCable parm;
+		feparm->getDVBC(parm);
+		eDebug("try to add %d %d %d %d",
+			parm.frequency, parm.symbol_rate, parm.modulation, parm.fec_inner);
+		break;
+	}
+	case iDVBFrontend::feTerrestrial:
+	{
+		eDVBFrontendParametersTerrestrial parm;
+		feparm->getDVBT(parm);
+		eDebug("try to add %d %d %d %d %d %d %d %d",
+			parm.frequency, parm.modulation, parm.transmission_mode, parm.hierarchy,
+			parm.guard_interval, parm.code_rate_LP, parm.code_rate_HP, parm.bandwidth);
+		break;
+	}
+	}
+
 		/* ... in the list of channels to scan */
-	for (std::list<ePtr<iDVBFrontendParameters> >::const_iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end(); ++i)
+	for (std::list<ePtr<iDVBFrontendParameters> >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end(); ++i)
 		if (sameChannel(*i, feparm))
+		{
+			*i = feparm;  // update
+			eDebug("update");
 			return;
+		}
 
 		/* ... in the list of successfully scanned channels */
 	for (std::list<ePtr<iDVBFrontendParameters> >::const_iterator i(m_ch_scanned.begin()); i != m_ch_scanned.end(); ++i)
 		if (sameChannel(*i, feparm))
+		{
+			eDebug("successfully scanned");
 			return;
-		
+		}
+
 		/* ... in the list of unavailable channels */
 	for (std::list<ePtr<iDVBFrontendParameters> >::const_iterator i(m_ch_unavailable.begin()); i != m_ch_unavailable.end(); ++i)
-		if (sameChannel(*i, feparm))
+		if (sameChannel(*i, feparm, true))
+		{
+			eDebug("scanned but not available");
 			return;
+		}
 
 		/* ... on the current channel */
 	if (sameChannel(m_ch_current, feparm))
+	{
+		eDebug("is current");
 		return;
+	}
 
+	eDebug("really add");
 		/* otherwise, add it to the todo list. */
 	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
+int eDVBScan::sameChannel(iDVBFrontendParameters *ch1, iDVBFrontendParameters *ch2, bool exact) const
 {
 	int diff;
-	if (ch1->calculateDifference(ch2, diff))
+	if (ch1->calculateDifference(ch2, diff, exact))
 		return 0;
 	if (diff < 4000) // more than 4mhz difference?
 		return 1;
@@ -310,7 +356,14 @@ void eDVBScan::channelDone()
 	
 	if (m_ready & validNIT)
 	{
+		int system;
+		m_ch_current->getSystem(system);
 		SCAN_eDebug("dumping NIT");
+		if (m_flags & clearToScanOnFirstNIT)
+		{
+			m_ch_toScan.clear();
+			m_flags &= ~clearToScanOnFirstNIT;
+		}
 		std::vector<NetworkInformationSection*>::const_iterator i;
 		for (i = m_NIT->getSections().begin(); i != m_NIT->getSections().end(); ++i)
 		{
@@ -332,6 +385,8 @@ void eDVBScan::channelDone()
 					{
 					case CABLE_DELIVERY_SYSTEM_DESCRIPTOR:
 					{
+						if (system != iDVBFrontend::feCable)
+							break; // when current locked transponder is no cable transponder ignore this descriptor
 						CableDeliverySystemDescriptor &d = (CableDeliverySystemDescriptor&)**desc;
 						ePtr<eDVBFrontendParameters> feparm = new eDVBFrontendParameters;
 						eDVBFrontendParametersCable cable;
@@ -349,6 +404,8 @@ void eDVBScan::channelDone()
 					}
 					case TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR:
 					{
+						if (system != iDVBFrontend::feTerrestrial)
+							break; // when current locked transponder is no terrestrial transponder ignore this descriptor
 						TerrestrialDeliverySystemDescriptor &d = (TerrestrialDeliverySystemDescriptor&)**desc;
 						ePtr<eDVBFrontendParameters> feparm = new eDVBFrontendParameters;
 						eDVBFrontendParametersTerrestrial terr;
@@ -366,6 +423,9 @@ void eDVBScan::channelDone()
 					}
 					case SATELLITE_DELIVERY_SYSTEM_DESCRIPTOR:
 					{
+						if (system != iDVBFrontend::feSatellite)
+							break; // when current locked transponder is no satellite transponder ignore this descriptor
+
 						SatelliteDeliverySystemDescriptor &d = (SatelliteDeliverySystemDescriptor&)**desc;
 						if (d.getFrequency() < 10000)
 							break;