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

3 files changed, 67 insertions, 4 deletions

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 26ce763b..2406326d 100644
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -1,4 +1,5 @@
-from enigma import eComponentScan
+from enigma import eComponentScan, iDVBFrontend
+from Components.NimManager import nimmanager as nimmgr
 
 class ServiceScan:
 	
@@ -25,8 +26,65 @@ class ServiceScan:
 				else:
 					self.state = self.Error
 					self.errorcode = errcode
+				self.network.setText("")
+				self.transponder.setText("")
 			else:
 				self.text.setText(_("scan in progress - %d %% done!\n%d services found!") % (self.scan.getProgress(), self.foundServices + self.scan.getNumServices()))
+				transponder = self.scan.getCurrentTransponder()
+				network = ""
+				tp_text = ""
+				if transponder:
+					tp_type = transponder.getSystem()
+					if not tp_type[0]:
+						tp_type = tp_type[1]
+						if tp_type == iDVBFrontend.feSatellite:
+							network = _("Satellite")
+							tp = transponder.getDVBS()
+							if not tp[0]:
+								tp = tp[1]
+								orb_pos = tp.orbital_position
+								try:
+									sat_name = str(nimmgr.getSatDescription(orb_pos))
+								except KeyError:
+									sat_name = ""
+								if orb_pos > 1800: # west
+									orb_pos = 3600 - orbpos
+									h = _("W")
+								else:
+									h = _("E")
+								if sat_name.find("%d.%d" % (orb_pos/10, orb_pos%10)) != -1:
+									network = sat_name
+								else:
+									network = ("%s %d.%d %s") % (sat_name, orb_pos / 10, orb_pos % 10, h)
+								tp_text = ("%s %s %d%c / %d / %s") %( { 0 : "DVB-S", 1 : "DVB-S2" }[tp.system],
+									{ 0 : "Auto", 1 : "QPSK", 2 : "M8PSK", 3 : "QAM16" }[tp.modulation],
+									tp.frequency/1000,
+									{ 0 : 'H', 1 : 'V', 2 : 'L', 3 : 'R' }[tp.polarisation],
+									tp.symbol_rate/1000,
+									{ 0 : "AUTO", 1 : "1/2", 2 : "2/3", 3 : "3/4", 4 : "5/6",
+									 5 : "7/8", 6 : "8/9", 7 : "3/5", 8 : "4/5", 9 : "9/10",
+									 15 : "NONE" }[tp.fec] )
+						elif tp_type == iDVBFrontend.feCable:
+							network = _("Cable")
+							tp = transponder.getDVBC()
+							if not tp[0]:
+								tp = tp[1]
+								tp_text = ("DVB-C %s %d / %d / %s") %( { 0 : "AUTO", 1 : "QAM16", 2 : "QAM32", 3 : "QAM64", 4 : "QAM128", 5 : "QAM256" }[tp.modulation],
+									tp.frequency,
+									tp.symbol_rate/1000,
+									{ 0 : "AUTO", 1 : "1/2", 2 : "2/3", 3 : "3/4", 4 : "5/6", 5 : "7/8", 6 : "8/9", 15 : "NONE" }[tp.fec_inner] )
+						elif tp_type == iDVBFrontend.feTerrestrial:
+							network = _("Terrestrial")
+							tp = transponder.getDVBT()
+							if not tp[0]:
+								tp = tp[1]
+								tp_text = ("DVB-T %s %d / %d") %( { 0 : "QPSK", 1 : "QAM16", 2 : "QAM64", 3 : "AUTO"}[tp.modulation],
+									tp.frequency,
+									tp.symbol_rate/1000)
+						else:
+							print "unknown transponder type in scanStatusChanged"
+				self.network.setText(network)
+				self.transponder.setText(tp_text)
 		
 		if self.state == self.Done:
 			if self.scan.getNumServices() == 1:
@@ -46,7 +104,7 @@ class ServiceScan:
 				self.run += 1
 				self.execBegin()
 	
-	def __init__(self, progressbar, text, servicelist, passNumber, scanList, frontendInfo):
+	def __init__(self, progressbar, text, servicelist, passNumber, scanList, network, transponder, frontendInfo):
 		self.foundServices = 0
 		self.progressbar = progressbar
 		self.text = text
@@ -54,6 +112,8 @@ class ServiceScan:
 		self.passNumber = passNumber
 		self.scanList = scanList
 		self.frontendInfo = frontendInfo
+		self.transponder = transponder
+		self.network = network
 		self.run = 0
 
 	def doRun(self):
diff --git a/lib/python/Screens/ServiceScan.py b/lib/python/Screens/ServiceScan.py
index a529e71c..3b1d780f 100644
--- a/lib/python/Screens/ServiceScan.py
+++ b/lib/python/Screens/ServiceScan.py
@@ -22,10 +22,13 @@ class ServiceScan(Screen):
 		
 		self["scan_progress"] = ProgressBar()
 		self["scan_state"] = Label(_("scan state"))
+		self["network"] = Label()
+		self["transponder"] = Label()
+
 		self["pass"] = Label("")
 		self["servicelist"] = FIFOList(len=7)
 		self["FrontendInfo"] = FrontendInfo()
-		self["scan"] = CScan(self["scan_progress"], self["scan_state"], self["servicelist"], self["pass"], scanList, self["FrontendInfo"])
+		self["scan"] = CScan(self["scan_progress"], self["scan_state"], self["servicelist"], self["pass"], scanList, self["network"], self["transponder"], self["FrontendInfo"])
 
 		self["actions"] = ActionMap(["OkCancelActions"], 
 			{
diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i
index 9c4c013a..e19f4561 100644
--- a/lib/python/enigma_python.i
+++ b/lib/python/enigma_python.i
@@ -75,13 +75,13 @@ is usually caused by not marking PSignals as immutable.
 #include <lib/gdi/gfont.h>
 #include <lib/gdi/epng.h>
 #include <lib/dvb/db.h>
+#include <lib/dvb/frontendparms.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/volume.h>
 #include <lib/dvb/sec.h>
 #include <lib/dvb/epgcache.h>
-#include <lib/dvb/frontendparms.h>
 #include <lib/dvb/dvbtime.h>
 #include <lib/dvb/pmt.h>
 #include <lib/components/scan.h>