git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
factorize code, remove debug, fix service info when no frontend info available (for...
[enigma2.git]
/
lib
/
python
/
Screens
/
ServiceInfo.py
diff --git
a/lib/python/Screens/ServiceInfo.py
b/lib/python/Screens/ServiceInfo.py
index a4bb4e02a4d5f0f75cad3cbff145efbef9468ba0..4cb9ce6e39ac3e5f946686d56ca7a586fbadfad5 100644
(file)
--- a/
lib/python/Screens/ServiceInfo.py
+++ b/
lib/python/Screens/ServiceInfo.py
@@
-68,7
+68,7
@@
class ServiceInfo(Screen):
service = session.nav.getCurrentService()
if service is not None:
self.info = service.info()
service = session.nav.getCurrentService()
if service is not None:
self.info = service.info()
- self.feinfo = service.frontend
Status
Info()
+ self.feinfo = service.frontendInfo()
print self.info.getInfoObject(iServiceInformation.sCAIDs);
else:
self.info = None
print self.info.getInfoObject(iServiceInformation.sCAIDs);
else:
self.info = None
@@
-106,15
+106,16
@@
class ServiceInfo(Screen):
("SID", self.getServiceInfoValue(iServiceInformation.sSID), TYPE_VALUE_HEX_DEC, 4))
self.fillList(Labels)
("SID", self.getServiceInfoValue(iServiceInformation.sSID), TYPE_VALUE_HEX_DEC, 4))
self.fillList(Labels)
- def
transponder(self
):
- frontendData = self.feinfo
.getFrontendData(True
)
+ def
showFrontendData(self, real
):
+ frontendData = self.feinfo
and self.feinfo.getFrontendData(real
)
Labels = self.getFEData(frontendData)
self.fillList(Labels)
Labels = self.getFEData(frontendData)
self.fillList(Labels)
+
+ def transponder(self):
+ self.showFrontendData(True)
def tuner(self):
def tuner(self):
- frontendData = self.feinfo.getFrontendData(False)
- Labels = self.getFEData(frontendData)
- self.fillList(Labels)
+ self.showFrontendData(False)
def getFEData(self, frontendData):
if frontendData is None:
def getFEData(self, frontendData):
if frontendData is None:
@@
-156,7
+157,6
@@
class ServiceInfo(Screen):
tlist = [ ]
for item in Labels:
tlist = [ ]
for item in Labels:
- print item
value = item[1]
if len(item) < 4:
tlist.append(ServiceInfoListEntry(item[0]+":", value, item[2]))
value = item[1]
if len(item) < 4:
tlist.append(ServiceInfoListEntry(item[0]+":", value, item[2]))