add possibility to get a dict with transponderdata for servicerefs

diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp
index 75307e852dea743c957e2c80a751fc64a91b5240..f40bf39e78187bf8b45e527554165fff4fde739e 100644 (file)
--- a/lib/base/ebase.cpp
+++ b/lib/base/ebase.cpp
@@ -334,10 +334,7 @@ PyObject *eMainloop::poll(ePyObject timeout, ePyObject dict)
        PyObject *res=0;
        
        if (app_quit_now)
        PyObject *res=0;
        
        if (app_quit_now)

-       {
-               Py_INCREF(Py_None);
-               return Py_None;
-       }
+               Py_RETURN_NONE;

        
        int user_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout);
 
        
        int user_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout);
 

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 47da4101102f1b18c63929a0557587f97789fc3c..90e8738d34b45314af32d9aaa55f23b658f57bb0 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -2240,10 +2240,7 @@ PyObject *eEPGCache::search(ePyObject arg)
        }
 
        if (!ret)
        }
 
        if (!ret)

-       {
-               Py_INCREF(Py_None);
-               ret=Py_None;
-       }
+               Py_RETURN_NONE;

 
        return ret;
 }
 
        return ret;
 }

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index d8be84940e60b0a2a37c366dca4ae73642e140de..91fad0a6d312d6d41e17b922bedacd0e75286cd1 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -1069,10 +1069,8 @@ PyObject *eDVBFrontend::readTransponderData(bool original)
                }
        }
        else
                }
        }
        else

-       {
-               Py_INCREF(Py_None);
-               ret = Py_None;
-       }
+               Py_RETURN_NONE;
+

        return ret;
 }
 
        return ret;
 }
 

diff --git a/lib/dvb_ci/dvbci_ui.cpp b/lib/dvb_ci/dvbci_ui.cpp
index 9fb89b396a13f721f3714658742d88aa112c77b8..47eb13d257047cb0ead72bab32992877a79e63bf 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.cpp
+++ b/lib/dvb_ci/dvbci_ui.cpp
@@ -266,8 +266,7 @@ PyObject *eDVBCI_UI::getMMIScreen(int slot)
                        return data.mmiScreen;
                }
        }
                        return data.mmiScreen;
                }
        }

-       Py_INCREF(Py_None);
-       return Py_None;
+       Py_RETURN_NONE;

 }
 
 //FIXME: correct "run/startlevel"
 }
 
 //FIXME: correct "run/startlevel"

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index d4272a0aac08ba7c1d812debf31a1aad43c8a6b2..621fa5cc907b0a33549d414c7891a9ede769f084 100644 (file)
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -195,10 +195,8 @@ void eListboxPythonStringContent::setList(ePyObject list)
 PyObject *eListboxPythonStringContent::getCurrentSelection()
 {
        if (!(m_list && cursorValid()))
 PyObject *eListboxPythonStringContent::getCurrentSelection()
 {
        if (!(m_list && cursorValid()))

-       {
-               Py_INCREF(Py_None);
-               return Py_None;
-       }
+               Py_RETURN_NONE;
+

        ePyObject r = PyList_GET_ITEM(m_list, m_cursor);
        Py_XINCREF(r);
        return r;
        ePyObject r = PyList_GET_ITEM(m_list, m_cursor);
        Py_XINCREF(r);
        return r;

diff --git a/lib/python/python.h b/lib/python/python.h
index 42749c7e3bd926cd671ba0a1ca354bc9c3c19c5e..d0fe92a878c40dc560f5a46f0c080c4ead3b88de 100644 (file)
--- a/lib/python/python.h
+++ b/lib/python/python.h
@@ -204,6 +204,15 @@ inline ePyObject Impl_PyString_FromString(const char* file, int line, const char
        return ePyObject(PyString_FromString(str), file, line);
 }
 
        return ePyObject(PyString_FromString(str), file, line);
 }
 

+inline ePyObject Impl_PyString_FromFormat(const char* file, int line, const char *fmt, ...)
+{
+       va_list ap;
+       va_start(ap, fmt);
+       PyObject *ob = PyString_FromFormatV(fmt, ap);
+       va_end(ap);
+       return ePyObject(ob, file, line);
+}
+

 inline ePyObject Impl_PyInt_FromLong(const char* file, int line, long val)
 {
        return ePyObject(PyInt_FromLong(val), file, line);
 inline ePyObject Impl_PyInt_FromLong(const char* file, int line, long val)
 {
        return ePyObject(PyInt_FromLong(val), file, line);


@@ -281,6 +290,15 @@ inline ePyObject Impl_PyString_FromString(const char *str)
        return PyString_FromString(str);
 }
 
        return PyString_FromString(str);
 }
 

+inline ePyObject Impl_PyString_FromFormat(const char *fmt, ...)
+{
+       va_list ap;
+       va_start(ap, fmt);
+       PyObject *ob = PyString_FromFormatV(fmt, ap);
+       va_end(ap);
+       return ePyObject(ob);
+}
+

 inline ePyObject Impl_PyInt_FromLong(long val)
 {
        return PyInt_FromLong(val);
 inline ePyObject Impl_PyInt_FromLong(long val)
 {
        return PyInt_FromLong(val);


@@ -337,6 +355,7 @@ inline void Impl_DECREF(PyObject *ob)
 #define PyTuple_New(args...) Impl_PyTuple_New(__FILE__, __LINE__, args)
 #define PyDict_New(...) Impl_PyDict_New(__FILE__, __LINE__)
 #define PyString_FromString(str) Impl_PyString_FromString(__FILE__, __LINE__, str)
 #define PyTuple_New(args...) Impl_PyTuple_New(__FILE__, __LINE__, args)
 #define PyDict_New(...) Impl_PyDict_New(__FILE__, __LINE__)
 #define PyString_FromString(str) Impl_PyString_FromString(__FILE__, __LINE__, str)

+#define PyString_FromFormat(str, args...) Impl_PyString_FromFormat(__FILE__, __LINE__, str, args)

 #define PyInt_FromLong(val) Impl_PyInt_FromLong(__FILE__, __LINE__, val)
 #define PyLong_FromLong(val) Impl_PyLong_FromLong(__FILE__, __LINE__, val)
 #define PyLong_FromUnsignedLong(val) Impl_PyLong_FromUnsignedLong(__FILE__, __LINE__, val)
 #define PyInt_FromLong(val) Impl_PyInt_FromLong(__FILE__, __LINE__, val)
 #define PyLong_FromLong(val) Impl_PyLong_FromLong(__FILE__, __LINE__, val)
 #define PyLong_FromUnsignedLong(val) Impl_PyLong_FromUnsignedLong(__FILE__, __LINE__, val)


@@ -353,6 +372,7 @@ inline void Impl_DECREF(PyObject *ob)
 #define PyTuple_New(args...) Impl_PyTuple_New(args)
 #define PyDict_New(...) Impl_PyDict_New()
 #define PyString_FromString(str) Impl_PyString_FromString(str)
 #define PyTuple_New(args...) Impl_PyTuple_New(args)
 #define PyDict_New(...) Impl_PyDict_New()
 #define PyString_FromString(str) Impl_PyString_FromString(str)

+#define PyString_FromFormat(str, args...) Impl_PyString_FromFormat(str, args)

 #define PyInt_FromLong(val) Impl_PyInt_FromLong(val)
 #define PyLong_FromLong(val) Impl_PyLong_FromLong(val)
 #define PyLong_FromUnsignedLong(val) Impl_PyLong_FromUnsignedLong(val)
 #define PyInt_FromLong(val) Impl_PyInt_FromLong(val)
 #define PyLong_FromLong(val) Impl_PyLong_FromLong(val)
 #define PyLong_FromUnsignedLong(val) Impl_PyLong_FromUnsignedLong(val)

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 85ac6fd37d781600187e7153bc30e26a4e730e4f..c809e813db440f2467e96339bf686ae14a03291b 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -243,7 +243,8 @@ public:
 
        virtual int getInfo(const eServiceReference &ref, int w);
        virtual std::string getInfoString(const eServiceReference &ref,int w);
 
        virtual int getInfo(const eServiceReference &ref, int w);
        virtual std::string getInfoString(const eServiceReference &ref,int w);

-
+       virtual PyObject *getInfoObject(const eServiceReference &ref, int w);
+       

        virtual int setInfo(const eServiceReference &ref, int w, int v);
        virtual int setInfoString(const eServiceReference &ref, int w, const char *v);
 };
        virtual int setInfo(const eServiceReference &ref, int w, int v);
        virtual int setInfoString(const eServiceReference &ref, int w, const char *v);
 };


@@ -303,7 +304,9 @@ public:
                sDVBState, /* states as defined in pmt handler (as events there) */
 
                sVideoHeight,
                sDVBState, /* states as defined in pmt handler (as events there) */
 
                sVideoHeight,

-               sVideoWidth
+               sVideoWidth,
+               
+               sTransponderData /* transponderdata as python dict */

        };
        enum { resNA = -1, resIsString = -2, resIsPyObject = -3 };
 
        };
        enum { resNA = -1, resIsString = -2, resIsPyObject = -3 };
 

diff --git a/lib/service/service.cpp b/lib/service/service.cpp
index 73544991419cfe6cae1167b2815898182340d77f..f409423635ab1526e0426cd949d4df7cbd0627e4 100644 (file)
--- a/lib/service/service.cpp
+++ b/lib/service/service.cpp
@@ -192,6 +192,11 @@ std::string iStaticServiceInformation::getInfoString(const eServiceReference &re
        return "";
 }
 
        return "";
 }
 

+PyObject *iStaticServiceInformation::getInfoObject(const eServiceReference &ref, int w)
+{
+       Py_RETURN_NONE;
+}
+

 int iServiceInformation::getInfo(int w)
 {
        return -1;
 int iServiceInformation::getInfo(int w)
 {
        return -1;


@@ -204,8 +209,7 @@ std::string iServiceInformation::getInfoString(int w)
 
 PyObject* iServiceInformation::getInfoObject(int w)
 {
 
 PyObject* iServiceInformation::getInfoObject(int w)
 {

-       Py_INCREF(Py_None);
-       return Py_None;
+       Py_RETURN_NONE;

 }
 
 int iStaticServiceInformation::setInfo(const eServiceReference &ref, int w, int v)
 }
 
 int iStaticServiceInformation::setInfo(const eServiceReference &ref, int w, int v)

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 24a919662dcf058d96eae1f6bdca5f62536ff8ef..dcf11d237d2beec586634f90f2adbfdc960468e3 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -40,6 +40,7 @@ public:
        RESULT getName(const eServiceReference &ref, std::string &name);
        int getLength(const eServiceReference &ref);
        int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
        RESULT getName(const eServiceReference &ref, std::string &name);
        int getLength(const eServiceReference &ref);
        int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);

+       PyObject *getInfoObject(const eServiceReference &ref, int);

 };
 
 DEFINE_REF(eStaticServiceDVBInformation);
 };
 
 DEFINE_REF(eStaticServiceDVBInformation);


@@ -106,6 +107,270 @@ int eStaticServiceDVBInformation::isPlayable(const eServiceReference &ref, const
        return false;
 }
 
        return false;
 }
 

+static void PutToDict(ePyObject &dict, const char*key, long value)
+{
+       ePyObject item = PyString_FromFormat("%d", value);
+       if (item)
+       {
+               if (PyDict_SetItemString(dict, key, item))
+                       eDebug("put %s to dict failed", key);
+               Py_DECREF(item);
+       }
+       else
+               eDebug("could not create PyObject for %s", key);
+}
+
+extern void PutToDict(ePyObject &dict, const char*key, const char *value);
+
+void PutSatelliteDataToDict(ePyObject &dict, eDVBFrontendParametersSatellite &feparm)
+{
+       const char *tmp=0;
+       PutToDict(dict, "type", "satellite");
+       PutToDict(dict, "frequency", feparm.frequency);
+       PutToDict(dict, "symbolrate", feparm.symbol_rate);
+       PutToDict(dict, "orbital position", feparm.orbital_position);
+       switch (feparm.inversion)
+       {
+               case eDVBFrontendParametersSatellite::Inversion::On: tmp="ON"; break;
+               case eDVBFrontendParametersSatellite::Inversion::Off: tmp="OFF"; break;
+               default:
+               case eDVBFrontendParametersSatellite::Inversion::Unknown: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "inversion", tmp);
+       switch (feparm.fec)
+       {
+               case eDVBFrontendParametersSatellite::FEC::fNone: tmp="NONE"; break;
+               case eDVBFrontendParametersSatellite::FEC::f1_2: tmp="1/2"; break;
+               case eDVBFrontendParametersSatellite::FEC::f2_3: tmp="2/3"; break;
+               case eDVBFrontendParametersSatellite::FEC::f3_4: tmp="3/4"; break;
+               case eDVBFrontendParametersSatellite::FEC::f5_6: tmp="5/6"; break;
+               case eDVBFrontendParametersSatellite::FEC::f7_8: tmp="7/8"; break;
+               case eDVBFrontendParametersSatellite::FEC::f3_5: tmp="3/5"; break;
+               case eDVBFrontendParametersSatellite::FEC::f4_5: tmp="4/5"; break;
+               case eDVBFrontendParametersSatellite::FEC::f8_9: tmp="8/9"; break;
+               case eDVBFrontendParametersSatellite::FEC::f9_10: tmp="9/10"; break;
+               default:
+               case eDVBFrontendParametersSatellite::FEC::fAuto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "fec inner", tmp);
+       switch (feparm.modulation)
+       {
+               case eDVBFrontendParametersSatellite::Modulation::Auto: tmp="AUTO"; break;
+               case eDVBFrontendParametersSatellite::Modulation::QPSK: tmp="QPSK"; break;
+               case eDVBFrontendParametersSatellite::Modulation::M8PSK: tmp="8PSK"; break;
+               case eDVBFrontendParametersSatellite::Modulation::QAM_16: tmp="QAM16"; break;
+       }
+       PutToDict(dict, "modulation", tmp);
+       switch(feparm.polarisation)
+       {
+               case eDVBFrontendParametersSatellite::Polarisation::Horizontal: tmp="HORIZONTAL"; break;
+               case eDVBFrontendParametersSatellite::Polarisation::Vertical: tmp="VERTICAL"; break;
+               case eDVBFrontendParametersSatellite::Polarisation::CircularLeft: tmp="CIRCULAR LEFT"; break;
+               default:
+               case eDVBFrontendParametersSatellite::Polarisation::CircularRight: tmp="CIRCULAR RIGHT"; break;
+       }
+       PutToDict(dict, "polarization", tmp);
+       switch(feparm.system)
+       {
+               default:
+               case eDVBFrontendParametersSatellite::System::DVB_S: tmp="DVB-S"; break;
+               case eDVBFrontendParametersSatellite::System::DVB_S2:
+                       switch(feparm.roll_off)
+                       {
+                               case eDVBFrontendParametersSatellite::RollOff::alpha_0_35: tmp="0.35"; break;
+                               case eDVBFrontendParametersSatellite::RollOff::alpha_0_25: tmp="0.25"; break;
+                               case eDVBFrontendParametersSatellite::RollOff::alpha_0_20: tmp="0.20"; break;
+                               default:
+                               case eDVBFrontendParametersSatellite::RollOff::alpha_auto: tmp="AUTO"; break;
+                       }
+                       PutToDict(dict, "roll off", tmp);
+                       tmp="DVB-S2";
+                       break;
+       }
+       PutToDict(dict, "system", tmp);
+}
+
+void PutTerrestrialDataToDict(ePyObject &dict, eDVBFrontendParametersTerrestrial &feparm)
+{
+       PutToDict(dict, "type", "terrestrial");
+       PutToDict(dict, "frequency", feparm.frequency);
+       const char *tmp=0;
+       switch (feparm.bandwidth)
+       {
+       case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz: tmp="8 Mhz"; break;
+       case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz: tmp="7 Mhz"; break;
+       case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz: tmp="6 Mhz"; break;
+       default:
+       case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "bandwidth", tmp);
+       switch (feparm.code_rate_LP)
+       {
+       case eDVBFrontendParametersTerrestrial::FEC::f1_2: tmp="1/2"; break;
+       case eDVBFrontendParametersTerrestrial::FEC::f2_3: tmp="2/3"; break;
+       case eDVBFrontendParametersTerrestrial::FEC::f3_4: tmp="3/4"; break;
+       case eDVBFrontendParametersTerrestrial::FEC::f5_6: tmp="5/6"; break;
+       case eDVBFrontendParametersTerrestrial::FEC::f7_8: tmp="7/8"; break;
+       default:
+       case eDVBFrontendParametersTerrestrial::FEC::fAuto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "code rate lp", tmp);
+       switch (feparm.code_rate_HP)
+       {
+       case eDVBFrontendParametersTerrestrial::FEC::f1_2: tmp="1/2"; break;
+       case eDVBFrontendParametersTerrestrial::FEC::f2_3: tmp="2/3"; break;
+       case eDVBFrontendParametersTerrestrial::FEC::f3_4: tmp="3/4"; break;
+       case eDVBFrontendParametersTerrestrial::FEC::f5_6: tmp="5/6"; break;
+       case eDVBFrontendParametersTerrestrial::FEC::f7_8: tmp="7/8"; break;
+       default:
+       case eDVBFrontendParametersTerrestrial::FEC::fAuto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "code rate hp", tmp);
+       switch (feparm.modulation)
+       {
+       case eDVBFrontendParametersTerrestrial::Modulation::QPSK: tmp="QPSK"; break;
+       case eDVBFrontendParametersTerrestrial::Modulation::QAM16: tmp="QAM16"; break;
+       case eDVBFrontendParametersTerrestrial::Modulation::QAM64: tmp="QAM64"; break;
+       default:
+       case eDVBFrontendParametersTerrestrial::Modulation::Auto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "constellation", tmp);
+       switch (feparm.transmission_mode)
+       {
+       case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k: tmp="2k"; break;
+       case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k: tmp="8k"; break;
+       default:
+       case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "transmission mode", tmp);
+       switch (feparm.guard_interval)
+       {
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32: tmp="1/32"; break;
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_16: tmp="1/16"; break;
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_8: tmp="1/8"; break;
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_4: tmp="1/4"; break;
+               default:
+               case eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "guard interval", tmp);
+       switch (feparm.hierarchy)
+       {
+               case eDVBFrontendParametersTerrestrial::Hierarchy::HNone: tmp="NONE"; break;
+               case eDVBFrontendParametersTerrestrial::Hierarchy::H1: tmp="1"; break;
+               case eDVBFrontendParametersTerrestrial::Hierarchy::H2: tmp="2"; break;
+               case eDVBFrontendParametersTerrestrial::Hierarchy::H4: tmp="4"; break;
+               default:
+               case eDVBFrontendParametersTerrestrial::Hierarchy::HAuto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "hierarchy", tmp);
+       switch (feparm.inversion)
+       {
+               case eDVBFrontendParametersSatellite::Inversion::On: tmp="ON"; break;
+               case eDVBFrontendParametersSatellite::Inversion::Off: tmp="OFF"; break;
+               default:
+               case eDVBFrontendParametersSatellite::Inversion::Unknown: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "inversion", tmp);
+}
+
+void PutCableDataToDict(ePyObject &dict, eDVBFrontendParametersCable &feparm)
+{
+       const char *tmp=0;
+       PutToDict(dict, "type", "cable");
+       PutToDict(dict, "frequency", feparm.frequency);
+       PutToDict(dict, "symbolrate", feparm.symbol_rate);
+       switch (feparm.modulation)
+       {
+       case eDVBFrontendParametersCable::Modulation::QAM16: tmp="QAM16"; break;
+       case eDVBFrontendParametersCable::Modulation::QAM32: tmp="QAM32"; break;
+       case eDVBFrontendParametersCable::Modulation::QAM64: tmp="QAM64"; break;
+       case eDVBFrontendParametersCable::Modulation::QAM128: tmp="QAM128"; break;
+       case eDVBFrontendParametersCable::Modulation::QAM256: tmp="QAM256"; break;
+       default:
+       case eDVBFrontendParametersCable::Modulation::Auto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "modulation", tmp);
+       switch (feparm.inversion)
+       {
+       case eDVBFrontendParametersCable::Inversion::On: tmp="ON"; break;
+       case eDVBFrontendParametersCable::Inversion::Off: tmp="OFF"; break;
+       default:
+       case eDVBFrontendParametersCable::Inversion::Unknown: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "inversion", tmp);
+       switch (feparm.fec_inner)
+       {
+       case eDVBFrontendParametersCable::FEC::fNone: tmp="NONE"; break;
+       case eDVBFrontendParametersCable::FEC::f1_2: tmp="1/2"; break;
+       case eDVBFrontendParametersCable::FEC::f2_3: tmp="2/3"; break;
+       case eDVBFrontendParametersCable::FEC::f3_4: tmp="3/4"; break;
+       case eDVBFrontendParametersCable::FEC::f5_6: tmp="5/6"; break;
+       case eDVBFrontendParametersCable::FEC::f7_8: tmp="7/8"; break;
+       case eDVBFrontendParametersCable::FEC::f8_9: tmp="8/9"; break;
+       default:
+       case eDVBFrontendParametersCable::FEC::fAuto: tmp="AUTO"; break;
+       }
+       PutToDict(dict, "fec inner", tmp);
+}
+
+PyObject *eStaticServiceDVBInformation::getInfoObject(const eServiceReference &r, int what)
+{
+       if (r.type == eServiceReference::idDVB)
+       {
+               const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)r;
+               switch(what)
+               {
+                       case iServiceInformation::sTransponderData:
+                       {
+                               ePtr<eDVBResourceManager> res;
+                               if (!eDVBResourceManager::getInstance(res))
+                               {
+                                       ePtr<iDVBChannelList> db;
+                                       if (!res->getChannelList(db))
+                                       {
+                                               eDVBChannelID chid;
+                                               ref.getChannelID(chid);
+                                               ePtr<iDVBFrontendParameters> feparm;
+                                               if (!db->getChannelFrontendData(chid, feparm))
+                                               {
+                                                       int system;
+                                                       if (!feparm->getSystem(system))
+                                                       {
+                                                               ePyObject dict = PyDict_New();
+                                                               switch(system)
+                                                               {
+                                                                       case iDVBFrontend::feSatellite:
+                                                                       {
+                                                                               eDVBFrontendParametersSatellite s;
+                                                                               feparm->getDVBS(s);
+                                                                               PutSatelliteDataToDict(dict, s);
+                                                                               break;
+                                                                       }
+                                                                       case iDVBFrontend::feTerrestrial:
+                                                                       {
+                                                                               eDVBFrontendParametersTerrestrial t;
+                                                                               feparm->getDVBT(t);
+                                                                               PutTerrestrialDataToDict(dict, t);
+                                                                               break;
+                                                                       }
+                                                                       case iDVBFrontend::feCable:
+                                                                       {
+                                                                               eDVBFrontendParametersCable c;
+                                                                               feparm->getDVBC(c);
+                                                                               PutCableDataToDict(dict, c);
+                                                                               break;
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+       Py_RETURN_NONE;
+}
+

 DEFINE_REF(eStaticServiceDVBBouquetInformation);
 
 RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref, std::string &name)
 DEFINE_REF(eStaticServiceDVBBouquetInformation);
 
 RESULT eStaticServiceDVBBouquetInformation::getName(const eServiceReference &ref, std::string &name)


@@ -1331,6 +1596,8 @@ PyObject *eDVBServicePlay::getInfoObject(int w)
        {
        case sCAIDs:
                return m_service_handler.getCaIds();
        {
        case sCAIDs:
                return m_service_handler.getCaIds();

+       case sTransponderData:
+               return eStaticServiceDVBInformation().getInfoObject(m_reference, w);

        default:
                break;
        }
        default:
                break;
        }


@@ -1516,10 +1783,7 @@ PyObject *eDVBServiceBase::getFrontendData(bool original)
                }
        }
        if (!ret)
                }
        }
        if (!ret)

-       {
-               ret = Py_None;
-               Py_INCREF(ret);
-       }
+               Py_RETURN_NONE;

        return ret;
 }
 
        return ret;
 }
 


@@ -1959,7 +2223,7 @@ void eDVBServicePlay::updateDecoder()
                        m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid);
                        m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid);
                }
                        m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid);
                        m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid);
                }

-       }
+       }       

        m_have_video_pid = (vpid > 0 && vpid < 0x2000);
 }
 
        m_have_video_pid = (vpid > 0 && vpid < 0x2000);
 }
 


@@ -2225,17 +2489,13 @@ PyObject *eDVBServicePlay::getCachedSubtitle()
                        }
                }
        }
                        }
                }
        }

-       Py_INCREF(Py_None);
-       return Py_None;
+       Py_RETURN_NONE;

 }
 
 PyObject *eDVBServicePlay::getSubtitleList()
 {
        if (!m_teletext_parser)
 }
 
 PyObject *eDVBServicePlay::getSubtitleList()
 {
        if (!m_teletext_parser)

-       {
-               Py_INCREF(Py_None);
-               return Py_None;
-       }
+               Py_RETURN_NONE;

        
        ePyObject l = PyList_New(0);
        std::set<int> added_ttx_pages;
        
        ePyObject l = PyList_New(0);
        std::set<int> added_ttx_pages;