add lockState and syncState to getFrontendInfo call

add skeleton for getTransponderInfo call

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 464ef7898f500f8c52bcefc92797ddcc5628878d..5bb6aeb4890f83890daa436c95df34a4d4d2d279 100644 (file)
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -504,6 +504,12 @@ int eDVBFrontend::readFrontendData(int type)
        return 0;
 }
 
+PyObject *eDVBFrontend::readTransponderData()
+{
+       Py_INCREF(Py_None);
+       return Py_None;
+}
+
 #ifndef FP_IOCTL_GET_ID
 #define FP_IOCTL_GET_ID 0
 #endif

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index c28399b4852d1e1031ef082ecfb5c6345fd58b54..8c5b757a6b532bd7e3c69389e62874215089e739 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -101,6 +101,8 @@ public:
        RESULT setData(int num, int val);
 
        int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, Locked, Synced
+       PyObject *readTransponderData();
+
        int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
        int getID() { return m_fe; }
 

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index ada337c8e68e9b4492e15472d811a7f28bda5cc9..a8f361a4008afc0d551f73cfc000ed04ca86b6fc 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -361,6 +361,7 @@ public:
                bitErrorRate, signalPower, signalQuality, Locked, Synced
        };
        virtual int readFrontendData(int type)=0;
+       virtual PyObject *readTransponderData()=0;
 
        virtual RESULT getData(int num, int &data)=0;
        virtual RESULT setData(int num, int val)=0;

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 86f2a29460eb05405ba11bb57153c6b8fd997112..f31831871ce687c92da9e808b29b9fe06db62453 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -271,9 +271,12 @@ public:
        enum {
                bitErrorRate,
                signalPower,
-               signalQuality
+               signalQuality,
+               LockState,
+               SyncState
        };
        virtual int getFrontendInfo(int w)=0;
+       virtual PyObject *getFrontendTransponderData()=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iFrontendStatusInformation>, iFrontendStatusInformationPtr);

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 8ff07250d611618d97190f8b95e03b1026c52886..c3bd1e6920776734eb7df68110332eeb7c792672 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1152,6 +1152,26 @@ int eDVBServicePlay::getFrontendInfo(int w)
        return fe->readFrontendData(w);
 }
 
+PyObject *eDVBServicePlay::getFrontendTransponderData()
+{
+       PyObject *ret=0;
+
+       eUsePtr<iDVBChannel> channel;
+       if(!m_service_handler.getChannel(channel))
+       {
+               ePtr<iDVBFrontend> fe;
+               if(!channel->getFrontend(fe))
+                       ret = fe->readTransponderData();
+       }
+
+       if (!ret)
+       {
+               ret = Py_None;
+               Py_INCREF(ret);
+       }
+       return ret;
+}
+
 int eDVBServicePlay::getNumberOfSubservices()
 {
        ePtr<eServiceEvent> evt;

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index b243ee078280436da1c68f297d21b3a66d4262b4..437a454b415c99412048875263d9e958ba75b2e2 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -105,6 +105,7 @@ public:
 
                // iFrontendStatusInformation
        int getFrontendInfo(int w);
+       PyObject *getFrontendTransponderData();
 
                // iSubserviceList
        int getNumberOfSubservices();