better solution to add possibility to delete eSocketNotifiers,

[vuplus_dvbapp] / lib / dvb / frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index df028c1..61ea3bc 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);
@@ -12,22 +13,29 @@ class eDVBFrontendParameters: public iDVBFrontendParameters
                eDVBFrontendParametersTerrestrial terrestrial;
        };
        int m_type;
+       int m_flags;
 public:
        eDVBFrontendParameters();
-       ~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, bool exact) const;
-       
-       RESULT getHash(unsigned long &SWIG_OUTPUT) const;
+
+       RESULT calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const;
+
+       RESULT getHash(unsigned long &) const;
+       RESULT calcLockTimeout(unsigned int &) const;
+
+       RESULT getFlags(unsigned int &flags) const { flags = m_flags; return 0; }
+       RESULT setFlags(unsigned int flags) { m_flags = flags; return 0; }
 };
 
 #ifndef SWIG
@@ -37,28 +45,11 @@ class eSecCommandList;
 
 class eDVBFrontend: public iDVBFrontend, public Object
 {
-       DECLARE_REF(eDVBFrontend);
-       int m_type;
-       int m_fe;
-       int m_fd;
-       char m_filename[128];
-#if HAVE_DVB_API_VERSION < 3
-       int m_secfd;
-       char m_sec_filename[128];
-#endif
-
-       FRONTENDPARAMETERS parm;
-       int m_state;
-       Signal1<void,iDVBFrontend*> m_stateChanged;
-       ePtr<iDVBSatelliteEquipmentControl> m_sec;
-       eSocketNotifier *m_sn;
-       int m_tuning;
-       eTimer *m_timeout;
-       eTimer *m_tuneTimer;
-
-       eSecCommandList m_sec_sequence;
-
+public:
        enum {
+               NEW_CSW,
+               NEW_UCSW,
+               NEW_TONEBURST,
                CSW,                  // state of the committed switch
                UCSW,                 // state of the uncommitted switch
                TONEBURST,            // current state of toneburst switch
@@ -74,8 +65,34 @@ class eDVBFrontend: public iDVBFrontend, public Object
                CUR_TONE,             // current continuous tone
                NUM_DATA_ENTRIES
        };
+       Signal1<void,iDVBFrontend*> m_stateChanged;
+private:
+       DECLARE_REF(eDVBFrontend);
+       bool m_simulate;
+       bool m_enabled;
+       int m_type;
+       int m_dvbid;
+       int m_slotid;
+       int m_fd;
+       bool m_need_rotor_workaround;
+       bool m_can_handle_dvbs2;
+       char m_filename[128];
+       char m_description[128];
+#if HAVE_DVB_API_VERSION < 3
+       int m_secfd;
+       char m_sec_filename[128];
+#endif
+       FRONTENDPARAMETERS parm;
+       int m_state;
+       ePtr<iDVBSatelliteEquipmentControl> m_sec;
+       ePtr<eSocketNotifier> m_sn;
+       int m_tuning;
+       eTimer *m_timeout;
+       eTimer *m_tuneTimer;
+
+       eSecCommandList m_sec_sequence;
 
-       int m_data[NUM_DATA_ENTRIES];
+       long m_data[NUM_DATA_ENTRIES];
 
        int m_idleInputpower[2];  // 13V .. 18V
        int m_runningInputpower;
@@ -87,15 +104,16 @@ class eDVBFrontend: public iDVBFrontend, public Object
        void timeout();
        void tuneLoop();  // called by m_tuneTimer
        void setFrontend();
-       int readInputpower();
        bool setSecSequencePos(int steps);
+       static int PriorityOrder;
 public:
-       eDVBFrontend(int adap, int fe, int &ok);        
+       eDVBFrontend(int adap, int fe, int &ok, bool simulate=false);
        virtual ~eDVBFrontend();
 
+       int readInputpower();
        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);
@@ -106,17 +124,25 @@ 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, signalQuality, locked, synced
-       PyObject *readTransponderData(bool original);
+       int readFrontendData(int type); // bitErrorRate, signalPower, signalQualitydB, 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();
+       int closeFrontend(bool force=false);
+       const char *getDescription() const { return m_description; }
+       bool is_simulate() const { return m_simulate; }
 };
 
 #endif // SWIG