servicemp3.cpp: more simple/flexible streaming detection

[enigma2.git] / lib / python / Tools / Transponder.py

diff --git a/lib/python/Tools/Transponder.py b/lib/python/Tools/Transponder.py
index f37603c5cf1122796a11f8e3427b28aedf6a78a4..0b8b96add3cfc07151eb741b4beafb0aeac07ac2 100644 (file)
--- a/lib/python/Tools/Transponder.py
+++ b/lib/python/Tools/Transponder.py
@@ -1,8 +1,10 @@
 from enigma import eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial
+from Components.NimManager import nimmanager
 
-def ConvertToHumanReadable(tp):
+def ConvertToHumanReadable(tp, type = None):
        ret = { }
-       type = tp.get("tuner_type", "None")
+       if type is None:
+               type = tp.get("tuner_type", "None")
        if type == "DVB-S":
                ret["tuner_type"] = _("Satellite")
                ret["inversion"] = {
@@ -26,6 +28,7 @@ def ConvertToHumanReadable(tp):
                        eDVBFrontendParametersSatellite.Modulation_QPSK : "QPSK",
                        eDVBFrontendParametersSatellite.Modulation_QAM16 : "QAM16",
                        eDVBFrontendParametersSatellite.Modulation_8PSK : "8PSK"}[tp["modulation"]]
+               ret["orbital_position"] = nimmanager.getSatName(int(tp["orbital_position"]))
                ret["polarization"] = {
                        eDVBFrontendParametersSatellite.Polarisation_Horizontal : _("Horizontal"),
                        eDVBFrontendParametersSatellite.Polarisation_Vertical : _("Vertical"),
@@ -111,6 +114,8 @@ def ConvertToHumanReadable(tp):
                        eDVBFrontendParametersTerrestrial.Inversion_Unknown : _("Auto"),
                        eDVBFrontendParametersTerrestrial.Inversion_On : _("On"),
                        eDVBFrontendParametersTerrestrial.Inversion_Off : _("Off")}[tp["inversion"]]
+       else:
+               print "ConvertToHumanReadable: no or unknown type in tpdata dict!"
        for x in tp.keys():
                if not ret.has_key(x):
                        ret[x] = tp[x]