make code inline

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

diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index ac18f3c66116d7cd8ce04456389a29778725f836..499e3737f3f0830ca2eb70b2d25f0dce28f842fa 100644 (file)
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -19,7 +19,10 @@ public:
                MEASURE_IDLE_INPUTPOWER, MEASURE_RUNNING_INPUTPOWER,
                IF_MEASURE_IDLE_WAS_NOT_OK_GOTO, IF_INPUTPOWER_DELTA_GOTO,
                UPDATE_CURRENT_ROTORPARAMS, INVALIDATE_CURRENT_ROTORPARMS,
-               IF_ROTORPOS_VALID_GOTO
+               IF_ROTORPOS_VALID_GOTO,
+               IF_TUNER_LOCKED_GOTO,
+               IF_TONE_GOTO, IF_NOT_TONE_GOTO,
+               START_TUNE_TIMEOUT
        };
        int cmd;
        struct rotor
@@ -31,7 +34,12 @@ public:
        };
        struct pair
        {
-               int voltage;
+               union
+               {
+                       int voltage;
+                       int tone;
+                       int val;
+               };
                int steps;
        };
        union
@@ -244,13 +252,11 @@ class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
        eDVBSatelliteEquipmentControl();
        ~eDVBSatelliteEquipmentControl();
 #endif
-       // helper function for setTunerLinked and setTunerDepends
-       RESULT setDependencyPointers( int no1, int no2, int dest_data_byte );
 public:
 #ifndef SWIG
        eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);
        DECLARE_REF(eDVBSatelliteEquipmentControl);
-       RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id);
+       RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id);
        int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id);
        bool currentLNBValid() { return m_lnbidx > -1 && m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)); }
 #endif
@@ -288,6 +294,7 @@ public:
        RESULT setTunerLinked(int from, int to);
        RESULT setTunerDepends(int from, int to);
 
+       PyObject *get_exclusive_satellites(int tu1, int tu2);
        void setRotorMoving(bool); // called from the frontend's
        bool isRotorMoving();
 };