cleanup

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 5a7b3dea5691628e4933526dd40397dc07ef0bf3..5d624264bb04d4d46b9fec3299817a0089882c5b 100644 (file)
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -36,54 +36,46 @@ class ServiceScan:
                                tp_text = ""
                                if transponder:
                                        tp_type = transponder.getSystem()
                                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 - orb_pos
-                                                                       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 %s") %( { 0 : "QPSK", 1 : "QAM16", 2 : "QAM64", 3 : "AUTO"}[tp.modulation],
-                                                                       tp.frequency,
-                                                                       { 0 : "Bw 8MHz", 1 : "Bw 7MHz", 2 : "Bw 6MHz", 3 : "Bw Auto" }[tp.bandwidth])
+                                       if tp_type == iDVBFrontend.feSatellite:
+                                               network = _("Satellite")
+                                               tp = transponder.getDVBS()
+                                               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 - orb_pos
+                                                       h = _("W")

                                                else:
                                                else:

-                                                       print "unknown transponder type in scanStatusChanged"
+                                                       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()
+                                               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()
+                                               tp_text = ("DVB-T %s %d %s") %( { 0 : "QPSK", 1 : "QAM16", 2 : "QAM64", 3 : "AUTO"}[tp.modulation],
+                                                       tp.frequency,
+                                                       { 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)
                                self.transponder.setText(tp_text)
                
                                self.network.setText(network)
                                self.transponder.setText(tp_text)