diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-10-29 21:34:57 +0000 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-16 17:15:38 +0100 |
| commit | 96857065b23a18ed81c3165b9c503d7563e30351 (patch) | |
| tree | 6362eec5929f297f8f530dde07f04cee6d8d81ca /lib/dvb/frontend.cpp | |
| parent | e367c9548469348afd8cbc2d232c4a2c78c75671 (diff) | |
| download | enigma2-96857065b23a18ed81c3165b9c503d7563e30351.tar.gz enigma2-96857065b23a18ed81c3165b9c503d7563e30351.zip | |
work around compile error with g++ 4.3.2
frontend.cpp:2114: error: invalid conversion from ‘int’ to ‘fe_spectral_inversion_t’
Diffstat (limited to 'lib/dvb/frontend.cpp')
| -rw-r--r-- | lib/dvb/frontend.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index ebdad8a7..ea9e7385 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -2111,8 +2111,8 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm, return -EINVAL; } #if HAVE_DVB_API_VERSION < 5 - parm_inversion |= (feparm.rolloff << 2); // Hack.. we use bit 2..3 of inversion param for rolloff - parm_inversion |= (feparm.pilot << 4); // Hack.. we use bit 4..5 of inversion param for pilot + parm_inversion = (fe_spectral_inversion_t)((feparm.rolloff << 2) | parm_inversion); // Hack.. we use bit 2..3 of inversion param for rolloff + parm_inversion = (fe_spectral_inversion_t)((feparm.pilot << 4) | parm_inversion); // Hack.. we use bit 4..5 of inversion param for pilot if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation_8PSK) { parm_u_qpsk_fec_inner = (fe_code_rate_t)((int)parm_u_qpsk_fec_inner+9); |