show more information in service scan (needs additional changes in skin)

2 files changed, 51 insertions, 41 deletions

diff --git a/lib/components/scan.cpp b/lib/components/scan.cpp
index a863d923..c027fe6b 100644
--- a/lib/components/scan.cpp
+++ b/lib/components/scan.cpp
@@ -10,42 +10,42 @@ void eComponentScan::scanEvent(int evt)
 {
 //	eDebug("scan event %d!", evt);
 	
-	if (evt == eDVBScan::evtFinish)
+	switch(evt)
 	{
-		m_done = 1;
-		ePtr<iDVBChannelList> db;
-		ePtr<eDVBResourceManager> res;
-		
-		int err;
-		if ((err = eDVBResourceManager::getInstance(res)) != 0)
-		{
-			eDebug("no resource manager");
-			m_failed = 2;
-		} else if ((err = res->getChannelList(db)) != 0)
+		case eDVBScan::evtFinish:
 		{
-			m_failed = 3;
-			eDebug("no channel list");
-		} else
-		{
-			m_scan->insertInto(db);
-			db->flush();
-			eDebug("scan done!");
+			m_done = 1;
+			ePtr<iDVBChannelList> db;
+			ePtr<eDVBResourceManager> res;
+			
+			int err;
+			if ((err = eDVBResourceManager::getInstance(res)) != 0)
+			{
+				eDebug("no resource manager");
+				m_failed = 2;
+			} else if ((err = res->getChannelList(db)) != 0)
+			{
+				m_failed = 3;
+				eDebug("no channel list");
+			} else
+			{
+				m_scan->insertInto(db);
+				db->flush();
+				eDebug("scan done!");
+			}
+			break;
 		}
+		case eDVBScan::evtNewService:
+			newService();
+			return;
+		case eDVBScan::evtFail:
+			eDebug("scan failed.");
+			m_failed = 1;
+			m_done = 1;
+			break;
+		case eDVBScan::evtUpdate:
+			break;
 	}
-	
-	if (evt == eDVBScan::evtNewService)
-	{
-		newService();
-		return;
-	}
-	
-	if (evt == eDVBScan::evtFail)
-	{
-		eDebug("scan failed.");
-		m_failed = 1;
-		m_done = 1;
-	}
-	
 	statusChanged();
 }
 
@@ -122,7 +122,7 @@ int eComponentScan::start(int feid, int flags)
 		{
 			if (m_initial.size() > 1)
 			{
-				iDVBFrontendParameters *tp = m_initial.first();
+				ePtr<iDVBFrontendParameters> tp = m_initial.first();
 				int type;
 				if (tp && !tp->getSystem(type))
 				{
@@ -151,14 +151,6 @@ int eComponentScan::start(int feid, int 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)
@@ -195,3 +187,20 @@ void eComponentScan::getLastServiceName(std::string &string)
 		return;
 	m_scan->getLastServiceName(string);
 }
+
+RESULT eComponentScan::getFrontend(ePtr<iDVBFrontend> &fe)
+{
+	if (m_scan)
+		return m_scan->getFrontend(fe);
+	fe = 0;
+	return -1;
+}
+
+RESULT eComponentScan::getCurrentTransponder(ePtr<iDVBFrontendParameters> &tp)
+{
+	if (m_scan)
+		return m_scan->getCurrentTransponder(tp);
+	tp = 0;
+	return -1;
+}
+
diff --git a/lib/components/scan.h b/lib/components/scan.h
index e4bb41ee..b5acf91a 100644
--- a/lib/components/scan.h
+++ b/lib/components/scan.h
@@ -48,6 +48,7 @@ public:
 	enum { scanNetworkSearch=1, scanRemoveServices=4, scanDontRemoveFeeds=8, clearToScanOnFirstNIT = 16 };
 	int start(int feid, int flags=0 );
 	SWIG_VOID(RESULT) getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT);
+	SWIG_VOID(RESULT) getCurrentTransponder(ePtr<iDVBFrontendParameters> &SWIG_OUTPUT);
 };
 
 #endif