call reloadBouquets instead of loadBouquets

[enigma2.git] / lib / python / Components / ServiceScan.py

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index ebd623e9b624e324e1cd9e4af982823511d7bdb5..1910e4541fbe0a0cd6a18cf4de09b34e004bf14b 100644 (file)
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -18,6 +18,7 @@ class ServiceScan:
        def scanStatusChanged(self):
                if self.state == self.Running:
                        self.progressbar.setValue(self.scan.getProgress())
+                       self.lcd_summary.updateProgress(self.scan.getProgress())
                        if self.scan.isDone():
                                errcode = self.scan.getError()
                                
@@ -78,9 +79,9 @@ class ServiceScan:
                                                        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_text = ("DVB-T %s %d %s") %( { 0 : "QPSK", 1 : "QAM16", 2 : "QAM64", 3 : "AUTO"}[tp.modulation],
                                                                        tp.frequency,
-                                                                       tp.symbol_rate/1000)
+                                                                       { 0 : "Bw 8MHz", 1 : "Bw 7MHz", 2 : "Bw 6MHz", 3 : "Bw Auto" }[tp.bandwidth])
                                                else:
                                                        print "unknown transponder type in scanStatusChanged"
                                self.network.setText(network)
@@ -104,7 +105,7 @@ class ServiceScan:
                                self.run += 1
                                self.execBegin()
        
-       def __init__(self, progressbar, text, servicelist, passNumber, scanList, network, transponder, frontendInfo):
+       def __init__(self, progressbar, text, servicelist, passNumber, scanList, network, transponder, frontendInfo, lcd_summary):
                self.foundServices = 0
                self.progressbar = progressbar
                self.text = text
@@ -115,6 +116,7 @@ class ServiceScan:
                self.transponder = transponder
                self.network = network
                self.run = 0
+               self.lcd_summary = lcd_summary
 
        def doRun(self):
                self.scan = eComponentScan()
@@ -160,6 +162,7 @@ class ServiceScan:
        def newService(self):
                newServiceName = self.scan.getLastServiceName()
                self.servicelist.addItem(newServiceName)
+               self.lcd_summary.updateService(self.scan.getLastServiceName())
 
        def destroy(self):
                pass