add possibility to set tuner priority for alternative services in Customize

[vuplus_dvbapp] / lib / dvb / frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 3670ceb..5821e54 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -2,6 +2,7 @@
 #define __dvb_frontend_h
 
 #include <lib/dvb/idvb.h>
+
 class eDVBFrontendParameters: public iDVBFrontendParameters
 {
        DECLARE_REF(eDVBFrontendParameters);
@@ -14,19 +15,22 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
        int m_type;
 public:
        eDVBFrontendParameters();
-       
+       ~eDVBFrontendParameters()
+       {
+       }
+
        RESULT getSystem(int &type) const;
-       RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;
-       RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const;
-       RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const;
+       RESULT getDVBS(eDVBFrontendParametersSatellite &) const;
+       RESULT getDVBC(eDVBFrontendParametersCable &) const;
+       RESULT getDVBT(eDVBFrontendParametersTerrestrial &) const;
 
        RESULT setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune=false);
        RESULT setDVBC(const eDVBFrontendParametersCable &p);
        RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
-       
-       RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT) const;
-       
-       RESULT getHash(unsigned long &SWIG_OUTPUT) const;
+
+       RESULT calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const;
+
+       RESULT getHash(unsigned long &) const;
 };
 
 #ifndef SWIG
@@ -37,10 +41,14 @@ class eSecCommandList;
 class eDVBFrontend: public iDVBFrontend, public Object
 {
        DECLARE_REF(eDVBFrontend);
+       bool m_enabled;
        int m_type;
-       int m_fe;
+       int m_dvbid;
+       int m_slotid;
        int m_fd;
+       bool m_need_rotor_workaround;
        char m_filename[128];
+       char m_description[128];
 #if HAVE_DVB_API_VERSION < 3
        int m_secfd;
        char m_sec_filename[128];
@@ -69,6 +77,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
+               CUR_VOLTAGE,          // current voltage
+               CUR_TONE,             // current continuous tone
                NUM_DATA_ENTRIES
        };
 
@@ -79,7 +89,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
        int m_timeoutCount; // needed for timeout
        int m_retryCount; // diseqc retry for rotor
-       int m_curVoltage;
 
        void feEvent(int);
        void timeout();
@@ -87,6 +96,8 @@ class eDVBFrontend: public iDVBFrontend, public Object
        void setFrontend();
        int readInputpower();
        bool setSecSequencePos(int steps);
+       void setRotorData(int pos, int cmd);
+       static int PriorityOrder;
 public:
        eDVBFrontend(int adap, int fe, int &ok);        
        virtual ~eDVBFrontend();
@@ -107,11 +118,17 @@ public:
        RESULT getData(int num, int &data);
        RESULT setData(int num, int val);
 
-       int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced
-       PyObject *readTransponderData(bool original);
+       int readFrontendData(int type); // bitErrorRate, signalPower, signalPowerdB, signalQuality, locked, synced
+       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 getDVBID() { return m_dvbid; }
+       int getSlotID() { return m_slotid; }
+       bool setSlotInfo(ePyObject obj); // get a tuple (slotid, slotdescr)
+       static void setTypePriorityOrder(int val) { PriorityOrder = val; }
+       static int getTypePriorityOrder() { return PriorityOrder; }
 
        int openFrontend();
        int closeFrontend();