X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/44433f650cd3e5f9f66253b74d194fcb01578595..09047544dbeddd0a5df972934c8863bef9e11a99:/lib/components/scan.cpp

diff --git a/lib/components/scan.cpp b/lib/components/scan.cpp
index c82d04ef..a863d923 100644
--- a/lib/components/scan.cpp
+++ b/lib/components/scan.cpp
@@ -8,7 +8,7 @@ DEFINE_REF(eComponentScan);
 
 void eComponentScan::scanEvent(int evt)
 {
-	eDebug("scan event %d!", evt);
+//	eDebug("scan event %d!", evt);
 	
 	if (evt == eDVBScan::evtFinish)
 	{
@@ -28,10 +28,17 @@ void eComponentScan::scanEvent(int evt)
 		} else
 		{
 			m_scan->insertInto(db);
+			db->flush();
 			eDebug("scan done!");
 		}
 	}
 	
+	if (evt == eDVBScan::evtNewService)
+	{
+		newService();
+		return;
+	}
+	
 	if (evt == eDVBScan::evtFail)
 	{
 		eDebug("scan failed.");
@@ -50,8 +57,38 @@ eComponentScan::~eComponentScan()
 {
 }
 
-int eComponentScan::start()
+void eComponentScan::clear()
+{
+	m_initial.clear();
+}
+
+void eComponentScan::addInitial(const eDVBFrontendParametersSatellite &p)
+{
+	ePtr<eDVBFrontendParameters> parm = new eDVBFrontendParameters();
+	parm->setDVBS(p);
+	m_initial.push_back(parm);
+}
+
+void eComponentScan::addInitial(const eDVBFrontendParametersCable &p)
+{
+	ePtr<eDVBFrontendParameters> parm = new eDVBFrontendParameters();
+	parm->setDVBC(p);
+	m_initial.push_back(parm);
+}
+
+void eComponentScan::addInitial(const eDVBFrontendParametersTerrestrial &p)
 {
+	ePtr<eDVBFrontendParameters> parm = new eDVBFrontendParameters();
+	parm->setDVBT(p);
+	m_initial.push_back(parm);
+}
+
+
+int eComponentScan::start(int feid, int flags)
+{
+	if (m_initial.empty())
+		return -2;
+
 	if (m_done != -1)
 		return -1;
 	
@@ -60,48 +97,68 @@ int eComponentScan::start()
 	
 	eDVBResourceManager::getInstance(mgr);
 
-	eDVBFrontendParameters *fe = new eDVBFrontendParameters();
-#if 0	
-	eDVBFrontendParametersSatellite fesat;
-		
-	fesat.frequency = 11817000; // 12070000;
-	fesat.symbol_rate = 27500000;
-	fesat.polarisation = eDVBFrontendParametersSatellite::Polarisation::Vertical;
-	fesat.fec = eDVBFrontendParametersSatellite::FEC::f3_4;
-	fesat.inversion = eDVBFrontendParametersSatellite::Inversion::Off;
-	fesat.orbital_position = 192;
-
-	
-	fe->setDVBS(fesat);
-#endif
-
-	eDVBFrontendParametersTerrestrial fet;
-	fet.frequency = 626000000;
-	fet.inversion = eDVBFrontendParametersTerrestrial::Inversion::Unknown;
-	fet.bandwidth = eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz;
-	fet.code_rate_HP = fet.code_rate_LP = eDVBFrontendParametersTerrestrial::FEC::fAuto;
-	fet.modulation = eDVBFrontendParametersTerrestrial::Modulation::QAM16;
-	fet.transmission_mode = eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k;
-	fet.guard_interval = eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32;
-	fet.hierarchy = eDVBFrontendParametersTerrestrial::Hierarchy::HNone;
-	fe->setDVBT(fet);
-	
-	ePtr<iDVBChannel> channel;
+	eUsePtr<iDVBChannel> channel;
 
-	if (mgr->allocateRawChannel(channel))
-		eDebug("scan: allocating raw channel failed!");
+	if (mgr->allocateRawChannel(channel, feid))
+	{
+		eDebug("scan: allocating raw channel (on frontend %d) failed!", feid);
+		return -1;
+	}
 
 	std::list<ePtr<iDVBFrontendParameters> > list;
-		
-	list.push_back(fe);
-	
 	m_scan = new eDVBScan(channel);
 	m_scan->connectEvent(slot(*this, &eComponentScan::scanEvent), m_scan_event_connection);
-	m_scan->start(list);
+
+	if (!(flags & scanRemoveServices))
+	{
+		ePtr<iDVBChannelList> db;
+		ePtr<eDVBResourceManager> res;
+		int err;
+		if ((err = eDVBResourceManager::getInstance(res)) != 0)
+			eDebug("no resource manager");
+		else if ((err = res->getChannelList(db)) != 0)
+			eDebug("no channel list");
+		else
+		{
+			if (m_initial.size() > 1)
+			{
+				iDVBFrontendParameters *tp = m_initial.first();
+				int type;
+				if (tp && !tp->getSystem(type))
+				{
+					switch(type)
+					{
+						case iDVBFrontend::feSatellite:
+						{
+							eDVBFrontendParametersSatellite parm;
+							tp->getDVBS(parm);
+							db->removeFlags(eDVBService::dxNewFound, -1, -1, -1, parm.orbital_position);
+							break;
+						}
+						case iDVBFrontend::feCable:
+							db->removeFlags(eDVBService::dxNewFound, 0xFFFF0000, -1, -1, -1);
+							break;
+						case iDVBFrontend::feTerrestrial:
+							db->removeFlags(eDVBService::dxNewFound, 0xEEEE0000, -1, -1, -1);
+							break;
+					}
+				}
+			}
+		}
+	}
+	m_scan->start(m_initial, flags);
 
 	return 0;
 }
 
+RESULT eComponentScan::getFrontend(ePtr<iDVBFrontend> &fe)
+{
+	if (m_scan)
+		return m_scan->getFrontend(fe);
+	fe = 0;
+	return -1;
+}
+
 int eComponentScan::getProgress()
 {
 	if (!m_scan)
@@ -126,3 +183,15 @@ int eComponentScan::isDone()
 {
 	return m_done;
 }
+
+int eComponentScan::getError()
+{
+	return m_failed;
+}
+
+void eComponentScan::getLastServiceName(std::string &string)
+{
+	if (!m_scan)
+		return;
+	m_scan->getLastServiceName(string);
+}