X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8c0683ea5313544bf03af234c0a863f0b1045514..4c697b16225031cc892857d78b7d6fb5d8f02280:/lib/dvb/scan.cpp

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index 8b895dc9..d5328163 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -120,16 +120,7 @@ RESULT eDVBScan::nextChannel()
 		return -ENOTSUP;
 	}
 
-	int fetype;
-	fe->getFrontendType(fetype);
-	if ( fetype == iDVBFrontend::feSatellite)
-	{
-		eDVBFrontendParametersSatellite p;
-		m_ch_current->getDVBS(p);
-		m_chid_current = eDVBChannelID(p.orbital_position << 16, -1, -1);
-	}
-	else
-		m_chid_current = eDVBChannelID();
+	m_chid_current = eDVBChannelID();
 
 	m_channel_state = iDVBChannel::state_idle;
 	if (fe->tune(*m_ch_current))
@@ -376,12 +367,13 @@ 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();
-			m_flags &= ~clearToScanOnFirstNIT;
 		}
 		std::vector<NetworkInformationSection*>::const_iterator i;
 		for (i = m_NIT->getSections().begin(); i != m_NIT->getSections().end(); ++i)
@@ -452,19 +444,29 @@ void eDVBScan::channelDone()
 						ePtr<eDVBFrontendParameters> feparm = new eDVBFrontendParameters;
 						eDVBFrontendParametersSatellite sat;
 						sat.set(d);
+
+						eDVBFrontendParametersSatellite p;
+						m_ch_current->getDVBS(p);
+
+						if ( abs(p.orbital_position - sat.orbital_position) < 5 )
+							sat.orbital_position = p.orbital_position;
+
+						if ( abs(abs(3600 - p.orbital_position) - sat.orbital_position) < 5 )
+						{
+							eDebug("found transponder with incorrect west/east flag ... correct this");
+							sat.orbital_position = p.orbital_position;
+						}
+
 						feparm->setDVBS(sat);
-						unsigned long hash=0;
-						feparm->getHash(hash);
-						
-						eDVBNamespace ns = buildNamespace(onid, tsid, hash);
-						
-						if ( m_chid_current.dvbnamespace.get() != -1 &&
-							((ns.get() ^ m_chid_current.dvbnamespace.get()) & 0xFFFF0000))
+
+						if ( p.orbital_position != sat.orbital_position)
 							SCAN_eDebug("dropping this transponder, it's on another satellite.");
 						else
 						{
+							unsigned long hash=0;
+							feparm->getHash(hash);
 							addChannelToScan(
-									eDVBChannelID(ns, tsid, onid),
+									eDVBChannelID(buildNamespace(onid, tsid, hash), tsid, onid),
 									feparm);
 						}
 						break;
@@ -474,9 +476,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;
 	}
 	
@@ -504,27 +522,25 @@ void eDVBScan::channelDone()
 		   These are the reasons for adding the transponder
 		   here, and not before.
 		*/
-
+	
 	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);
-
-		for (std::list<ePtr<iDVBFrontendParameters> >::iterator i(m_ch_toScan.begin()); i != m_ch_toScan.end();)
+	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))
 		{
-			if (sameChannel(*i, m_ch_current))
-			{
-				eDebug("remove dupe 2");
-				m_ch_toScan.erase(i++);
-				continue;
-			}
-			++i;
+			eDebug("remove dupe 2");
+			m_ch_toScan.erase(i++);
+			continue;
 		}
+		++i;
 	}
-
+	
 	nextChannel();
 }