cleanup code

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

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 2a180babe631c4a787511839eeb741ad222e1059..ac681bbe06ef8bc1c8edacf1b153f17329bce7dc 100644 (file)
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -31,6 +31,7 @@ public:
        RESULT calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const;
 
        RESULT getHash(unsigned long &) const;
+       RESULT calcLockTimeout(unsigned int &) const;
 };
 
 #ifndef SWIG
@@ -82,7 +83,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
                NUM_DATA_ENTRIES
        };
 
-       int m_data[NUM_DATA_ENTRIES];
+       long m_data[NUM_DATA_ENTRIES];
 
        int m_idleInputpower[2];  // 13V .. 18V
        int m_runningInputpower;
@@ -97,13 +98,14 @@ class eDVBFrontend: public iDVBFrontend, public Object
        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();
 
        RESULT getFrontendType(int &type);
        RESULT tune(const iDVBFrontendParameters &where);
-       RESULT prepare_sat(const eDVBFrontendParametersSatellite &);
+       RESULT prepare_sat(const eDVBFrontendParametersSatellite &, unsigned int timeout);
        RESULT prepare_cable(const eDVBFrontendParametersCable &);
        RESULT prepare_terrestrial(const eDVBFrontendParametersTerrestrial &);
        RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection);
@@ -114,10 +116,10 @@ public:
        RESULT sendToneburst(int burst);
        RESULT setSEC(iDVBSatelliteEquipmentControl *sec);
        RESULT setSecSequence(const eSecCommandList &list);
-       RESULT getData(int num, int &data);
-       RESULT setData(int num, int val);
+       RESULT getData(int num, long &data);
+       RESULT setData(int num, long val);
 
-       int readFrontendData(int type); // bitErrorRate, signalPower, signalPowerdB, signalQuality, locked, synced
+       int readFrontendData(int type); // bitErrorRate, signalPower, signalQualitydB, signalQuality, locked, synced
        void getFrontendStatus(ePyObject dest);
        void getTransponderData(ePyObject dest, bool original);
        void getFrontendData(ePyObject dest);
@@ -126,9 +128,12 @@ public:
        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();
+       const char *getDescription() const { return m_description; }
 };
 
 #endif // SWIG