diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-06-13 09:57:56 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-06-13 09:57:56 +0000 |
| commit | 2e0270746af934180499931f95ed91c444c8233e (patch) | |
| tree | 8a3347e3ba191a05067d2ad43b23c221d9cc9fff /lib/dvb/frontend.h | |
| parent | 86470f194147f01561a0d371eb8eb8977eccaa93 (diff) | |
| download | enigma2-2e0270746af934180499931f95ed91c444c8233e.tar.gz enigma2-2e0270746af934180499931f95ed91c444c8233e.zip | |
after DECLARE_REF now all is private.. not public
dont export AddRef, Release, ptrref and grabRef to python
some cleanups
Diffstat (limited to 'lib/dvb/frontend.h')
| -rw-r--r-- | lib/dvb/frontend.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h index ac681bbe..bbfd174d 100644 --- a/lib/dvb/frontend.h +++ b/lib/dvb/frontend.h @@ -41,6 +41,25 @@ class eSecCommandList; class eDVBFrontend: public iDVBFrontend, public Object { +public: + enum { + CSW, // state of the committed switch + UCSW, // state of the uncommitted switch + TONEBURST, // current state of toneburst switch + NEW_ROTOR_CMD, // prev sent rotor cmd + NEW_ROTOR_POS, // new rotor position (not validated) + ROTOR_CMD, // completed rotor cmd (finalized) + ROTOR_POS, // current rotor position + LINKED_PREV_PTR, // prev double linked list (for linked FEs) + 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 + }; + Signal1<void,iDVBFrontend*> m_stateChanged; +private: DECLARE_REF(eDVBFrontend); bool m_enabled; int m_type; @@ -54,10 +73,8 @@ class eDVBFrontend: public iDVBFrontend, public Object 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; @@ -66,23 +83,6 @@ class eDVBFrontend: public iDVBFrontend, public Object eSecCommandList m_sec_sequence; - enum { - CSW, // state of the committed switch - UCSW, // state of the uncommitted switch - TONEBURST, // current state of toneburst switch - NEW_ROTOR_CMD, // prev sent rotor cmd - NEW_ROTOR_POS, // new rotor position (not validated) - ROTOR_CMD, // completed rotor cmd (finalized) - ROTOR_POS, // current rotor position - LINKED_PREV_PTR, // prev double linked list (for linked FEs) - 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 - }; - long m_data[NUM_DATA_ENTRIES]; int m_idleInputpower[2]; // 13V .. 18V @@ -95,7 +95,6 @@ class eDVBFrontend: public iDVBFrontend, public Object void timeout(); void tuneLoop(); // called by m_tuneTimer void setFrontend(); - int readInputpower(); bool setSecSequencePos(int steps); void setRotorData(int pos, int cmd); static int PriorityOrder; @@ -103,6 +102,7 @@ public: eDVBFrontend(int adap, int fe, int &ok); virtual ~eDVBFrontend(); + int readInputpower(); RESULT getFrontendType(int &type); RESULT tune(const iDVBFrontendParameters &where); RESULT prepare_sat(const eDVBFrontendParametersSatellite &, unsigned int timeout); |