use hex instead of decimal

[enigma2.git] / lib / dvb / frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 3670ceb800ee37745e33f8cdfbbc4b62df56736c..cfe25d1a80e37c6f9a388f7e9c0460b4d85bd707 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -14,6 +14,7 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
        int m_type;
 public:
        eDVBFrontendParameters();
        int m_type;
 public:
        eDVBFrontendParameters();

+       ~eDVBFrontendParameters() {}

        
        RESULT getSystem(int &type) const;
        RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;
        
        RESULT getSystem(int &type) const;
        RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;


@@ -24,7 +25,7 @@ public:
        RESULT setDVBC(const eDVBFrontendParametersCable &p);
        RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
        
        RESULT setDVBC(const eDVBFrontendParametersCable &p);
        RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
        

-       RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT) const;
+       RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const;

        
        RESULT getHash(unsigned long &SWIG_OUTPUT) const;
 };
        
        RESULT getHash(unsigned long &SWIG_OUTPUT) const;
 };


@@ -69,6 +70,8 @@ class eDVBFrontend: public iDVBFrontend, public Object
                LINKED_NEXT_PTR,      // next double linked list (for linked FEs)
                SATPOS_DEPENDS_PTR,   // pointer to FE with configured rotor (with twin/quattro lnb)
                FREQ_OFFSET,          // current frequency offset
                LINKED_NEXT_PTR,      // next double linked list (for linked FEs)
                SATPOS_DEPENDS_PTR,   // pointer to FE with configured rotor (with twin/quattro lnb)
                FREQ_OFFSET,          // current frequency offset

+               CUR_VOLTAGE,          // current voltage
+               CUR_TONE,             // current continuous tone

                NUM_DATA_ENTRIES
        };
 
                NUM_DATA_ENTRIES
        };
 


@@ -79,7 +82,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
        int m_timeoutCount; // needed for timeout
        int m_retryCount; // diseqc retry for rotor
 
        int m_timeoutCount; // needed for timeout
        int m_retryCount; // diseqc retry for rotor

-       int m_curVoltage;

 
        void feEvent(int);
        void timeout();
 
        void feEvent(int);
        void timeout();


@@ -108,7 +110,9 @@ public:
        RESULT setData(int num, int val);
 
        int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced
        RESULT setData(int num, int val);
 
        int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced

-       PyObject *readTransponderData(bool original);
+       void getFrontendStatus(ePyObject dest);
+       void getTransponderData(ePyObject dest, bool original);
+       void getFrontendData(ePyObject dest);

 
        int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
        int getID() { return m_fe; }
 
        int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
        int getID() { return m_fe; }