From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 29 Oct 2010 21:34:57 +0000 (+0000)
Subject: work around compile error with g++ 4.3.2
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=96857065b23a18ed81c3165b9c503d7563e30351;hp=e367c9548469348afd8cbc2d232c4a2c78c75671

work around compile error with g++ 4.3.2

frontend.cpp:2114: error: invalid conversion from ‘int’ to ‘fe_spectral_inversion_t’
---

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index ebdad8a..ea9e738 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);