X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/196634a2be3f5cbac64aeefc6e0aaef142115567..ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4:/lib/dvb/scan.cpp

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index d21ed10b..3c952b8f 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -268,7 +268,7 @@ void eDVBScan::addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameter
 	{
 		eDVBFrontendParametersCable parm;
 		feparm->getDVBC(parm);
-		eDebug("try to add %d %d %d %d %d",
+		eDebug("try to add %d %d %d %d",
 			parm.frequency, parm.symbol_rate, parm.modulation, parm.fec_inner);
 		break;
 	}
@@ -283,14 +283,33 @@ void eDVBScan::addChannelToScan(const eDVBChannelID &chid, iDVBFrontendParameter
 	}
 	}
 
+	int found_count=0;
 		/* ... in the list of channels to scan */
-	for (std::list<ePtr<iDVBFrontendParameters> >::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();)
+	{
 		if (sameChannel(*i, feparm))
 		{
-			*i = feparm;  // update
-			eDebug("update");
-			return;
+			if (!found_count)
+			{
+				*i = feparm;  // update
+				eDebug("update");
+			}
+			else
+			{
+				eDebug("remove dupe");
+				m_ch_toScan.erase(i++);
+				continue;
+			}
+			++found_count;
 		}
+		++i;
+	}
+
+	if (found_count > 0)
+	{
+		eDebug("already in todo list");
+		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)
@@ -356,7 +375,15 @@ void eDVBScan::channelDone()
 	
 	if (m_ready & validNIT)
 	{
+		int system;
+		std::list<ePtr<iDVBFrontendParameters> > m_ch_toScan_backup;
+		m_ch_current->getSystem(system);
 		SCAN_eDebug("dumping NIT");
+		if (m_flags & clearToScanOnFirstNIT)
+		{
+			m_ch_toScan_backup = m_ch_toScan;
+			m_ch_toScan.clear();
+		}
 		std::vector<NetworkInformationSection*>::const_iterator i;
 		for (i = m_NIT->getSections().begin(); i != m_NIT->getSections().end(); ++i)
 		{
@@ -378,6 +405,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;
@@ -395,6 +424,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;
@@ -412,6 +443,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;
@@ -441,9 +475,25 @@ void eDVBScan::channelDone()
 						break;
 					}
 				}
-				
 			}
+			
 		}
+
+			/* a pitfall is to have the clearToScanOnFirstNIT-flag set, and having channels which have
+			   no or invalid NIT. this code will not erase the toScan list unless at least one valid entry
+			   has been found.
+
+			   This is not a perfect solution, as the channel could contain a partial NIT. Life's bad.
+			*/
+		if (m_flags & clearToScanOnFirstNIT)
+		{
+			if (m_ch_toScan.empty())
+			{
+				eWarning("clearToScanOnFirstNIT was set, but NIT is invalid. Refusing to stop scan.");
+				m_ch_toScan = m_ch_toScan_backup;
+			} else
+	 			m_flags &= ~clearToScanOnFirstNIT;
+ 		}
 		m_ready &= ~validNIT;
 	}
 	
@@ -475,9 +525,23 @@ void eDVBScan::channelDone()
 	if (!m_chid_current)
 		eWarning("SCAN: the current channel's ID was not corrected - not adding channel.");
 	else
+	{
 		addKnownGoodChannel(m_chid_current, m_ch_current);
 	
-	m_ch_scanned.push_back(m_ch_current);
+		m_ch_scanned.push_back(m_ch_current);
+
+		for (std::list<ePtr<iDVBFrontendParameters> >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end();)
+		{
+			if (sameChannel(*i, m_ch_current))
+			{
+				eDebug("remove dupe 2");
+				m_ch_toScan.erase(i++);
+				continue;
+			}
+			++i;
+		}
+	}
+
 	nextChannel();
 }
 
@@ -496,7 +560,7 @@ void eDVBScan::start(const eSmartPtrList<iDVBFrontendParameters> &known_transpon
 		bool exist=false;
 		for (std::list<ePtr<iDVBFrontendParameters> >::const_iterator ii(m_ch_toScan.begin()); ii != m_ch_toScan.end(); ++ii)
 		{
-			if (sameChannel(*i, *ii))
+			if (sameChannel(*i, *ii, true))
 			{
 				exist=true;
 				break;