rename iFrontendStatusInformation to iFrontendInformation

[enigma2.git] / lib / python / Screens / ServiceInfo.py

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index faa006bd6b857f4b0b9361aac17201b99d5c1ea5..c1755d4b49b49d63bb8e6901ad03f6f2af230395 100644 (file)
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -45,15 +45,12 @@ class ServiceInfoList(HTMLComponent, GUIComponent):
                self.l.setList(self.list)
                self.l.setFont(0, gFont("Regular", 23))
 
-       def GUIcreate(self, parent):
-               self.instance = eListbox(parent)
+       GUI_WIDGET = eListbox
+       
+       def postWidgetCreate(self, instance):
                self.instance.setContent(self.l)
                self.instance.setItemHeight(25)
 
-       def GUIdelete(self):
-               self.instance.setContent(None)
-               self.instance = None
-
 class ServiceInfo(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
@@ -71,7 +68,8 @@ class ServiceInfo(Screen):
                service = session.nav.getCurrentService()
                if service is not None:
                        self.info = service.info()
-                       self.feinfo = service.frontendStatusInfo()
+                       self.feinfo = service.frontendInfo()
+                       print self.info.getInfoObject(iServiceInformation.sCAIDs);
                else:
                        self.info = None
 
@@ -141,7 +139,18 @@ class ServiceInfo(Screen):
                                           ("FEC inner", frontendData["fec_inner"], TYPE_TEXT),
                                                )
                elif frontendData["tuner_type"] == "DVB-T":
-                       return []
+                       return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+                                          ("Type", frontendData["tuner_type"], TYPE_TEXT),
+                                          ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
+                                          ("Inversion", frontendData["inversion"], TYPE_TEXT),
+                                          ("Bandwidth", frontendData["bandwidth"], TYPE_VALUE_DEC),
+                                          ("CodeRateLP", frontendData["code_rate_lp"], TYPE_TEXT),
+                                          ("CodeRateHP", frontendData["code_rate_hp"], TYPE_TEXT),
+                                          ("Constellation", frontendData["constellation"], TYPE_TEXT),
+                                          ("Transmission Mode", frontendData["transmission_mode"], TYPE_TEXT),
+                                          ("Guard Interval", frontendData["guard_interval"], TYPE_TEXT),
+                                          ("Hierarchy Inform.", frontendData["hierarchy_information"], TYPE_TEXT),
+                                               )
                
        def fillList(self, Labels):
                tlist = [ ]