diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-11 12:52:48 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-11 12:52:48 +0100 |
| commit | bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b (patch) | |
| tree | c5945c791698c14723e989449e6b4bfcc275c05d /lib/dvb/frontend.h | |
| parent | 4f7990ff2a55874b9eb65e3c9cd47dacb9f76deb (diff) | |
| parent | 5e6f814d005a01caa437a532e61f4b338617ff67 (diff) | |
| download | enigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.tar.gz enigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts:
lib/dvb/decoder.cpp
Diffstat (limited to 'lib/dvb/frontend.h')
| -rw-r--r-- | lib/dvb/frontend.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h index 06ed12cc..81334886 100644 --- a/lib/dvb/frontend.h +++ b/lib/dvb/frontend.h @@ -20,22 +20,22 @@ public: { } - RESULT getSystem(int &type) const; - RESULT getDVBS(eDVBFrontendParametersSatellite &) const; - RESULT getDVBC(eDVBFrontendParametersCable &) const; - RESULT getDVBT(eDVBFrontendParametersTerrestrial &) const; + SWIG_VOID(RESULT) getSystem(int &SWIG_OUTPUT) const; + SWIG_VOID(RESULT) getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const; + SWIG_VOID(RESULT) getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const; + SWIG_VOID(RESULT) getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const; RESULT setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune=false); RESULT setDVBC(const eDVBFrontendParametersCable &p); RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p); - + SWIG_VOID(RESULT) getFlags(unsigned int &SWIG_NAMED_OUTPUT(flags)) const { flags = m_flags; return 0; } + RESULT setFlags(unsigned int flags) { m_flags = flags; return 0; } +#ifndef SWIG 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; } +#endif }; #ifndef SWIG @@ -63,6 +63,7 @@ public: FREQ_OFFSET, // current frequency offset CUR_VOLTAGE, // current voltage CUR_TONE, // current continuous tone + SATCR, // current SatCR NUM_DATA_ENTRIES }; Signal1<void,iDVBFrontend*> m_stateChanged; @@ -142,6 +143,9 @@ public: int closeFrontend(bool force=false); const char *getDescription() const { return m_description; } bool is_simulate() const { return m_simulate; } + + RESULT turnOffSatCR(int satcr); + RESULT ScanSatCR(); }; #endif // SWIG |