now link dvb-s frontends to dvb-s2 frontends is possible

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

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 36f580ca394f9d3b39395a3652dbaa4cbc2cc0ce..2aee67e6b43955851ff438a131a58e7b60809f6c 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -297,13 +297,14 @@ public:
        enum
        {
                dxNoSDT=1,    // don't get SDT
-//nyi  dxDontshow=2,
+               dxDontshow=2,
                dxNoDVB=4,  // dont use PMT for this service ( use cached pids )
                dxHoldName=8,
                dxNewFound=64,
        };
 
        bool usePMT() const { return !(m_flags & dxNoDVB); }
+       bool isHidden() const { return m_flags & dxDontshow; }
 
        CAID_LIST m_ca;
 
@@ -408,6 +409,7 @@ public:
        
        virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const = 0;
        virtual RESULT getHash(unsigned long &SWIG_OUTPUT) const = 0;
+       virtual RESULT calcLockTimeout(unsigned int &) const = 0;
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<iDVBFrontendParameters>, iDVBFrontendParametersPtr);
 
@@ -441,7 +443,7 @@ class iDVBFrontend_ENUMS
 #endif
 public:
        enum { feSatellite, feCable, feTerrestrial };
-       enum { stateIdle, stateTuning, stateFailed, stateLock, stateLostLock };
+       enum { stateIdle, stateTuning, stateFailed, stateLock, stateLostLock, stateClosed };
        enum { toneOff, toneOn };
        enum { voltageOff, voltage13, voltage18, voltage13_5, voltage18_5 };
        enum { bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber, signalQualitydB };
@@ -482,7 +484,7 @@ SWIG_TEMPLATE_TYPEDEF(ePtr<iDVBFrontend>, iDVBFrontendPtr);
 class iDVBSatelliteEquipmentControl: public iObject
 {
 public:
-       virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id)=0;
+       virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int timeout)=0;
        virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id)=0;
        virtual void setRotorMoving(bool)=0;
 };