X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b0e09a2cd9a05a002222d79fb71848f4c7820ff3..e330dbae62e83dd2aa2ff63a984519a84b23c3ad:/lib/dvb/scan.cpp

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index 1c98dce0..8865f304 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -30,29 +30,28 @@ eDVBScan::~eDVBScan()
 {
 }
 
-int eDVBScan::isValidONIDTSID(eOriginalNetworkID onid, eTransportStreamID tsid)
+int eDVBScan::isValidONIDTSID(int orbital_position, eOriginalNetworkID onid, eTransportStreamID tsid)
 {
 	switch (onid.get())
 	{
 	case 0:
-	case 0xFFFF:
 	case 0x1111:
 		return 0;
 	case 1:
-		return tsid>1;
+		return orbital_position == 192;
 	case 0x00B1:
 		return tsid != 0x00B0;
 	case 0x0002:
-		return tsid != 0x07E8;
+		return abs(orbital_position-282) < 6;
 	default:
-		return 1;
+		return onid.get() < 0xFF00;
 	}
 }
 
 eDVBNamespace eDVBScan::buildNamespace(eOriginalNetworkID onid, eTransportStreamID tsid, unsigned long hash)
 {
 		// on valid ONIDs, ignore frequency ("sub network") part
-	if (isValidONIDTSID(onid, tsid))
+	if (isValidONIDTSID((hash >> 16) & 0xFFFF, onid, tsid))
 		hash &= ~0xFFFF;
 	return eDVBNamespace(hash);
 }
@@ -105,7 +104,6 @@ RESULT eDVBScan::nextChannel()
 	}
 	
 	m_ch_current = m_ch_toScan.front();
-	m_chid_current = eDVBChannelID();
 	
 	m_ch_toScan.pop_front();
 	
@@ -114,7 +112,18 @@ RESULT eDVBScan::nextChannel()
 		m_event(evtFail);
 		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_channel_state = iDVBChannel::state_idle;
 	if (fe->tune(*m_ch_current))
 	{
@@ -302,7 +311,8 @@ void eDVBScan::channelDone()
 						
 						eDVBNamespace ns = buildNamespace(onid, tsid, hash);
 						
-						if (m_chid_current && ((ns.get() ^ m_chid_current.dvbnamespace.get()) & 0xFFFF0000))
+						if ( m_chid_current.dvbnamespace.get() != -1 &&
+							((ns.get() ^ m_chid_current.dvbnamespace.get()) & 0xFFFF0000))
 							eDebug("dropping this transponder, it's on another satellite.");
 						else
 						{