Revert "Changing API removing sweet spot widening factor and adding cross-talk...

Revert "Changing API removing sweet spot widening factor and adding cross-talk cancellation factor and wave incidence angle factor (+ getter/setter)"

This reverts commit e4e8cca5.

Please use feature branch instead.

include/ITANCTC.h

@@ -119,8 +119,7 @@ public:
 		double dSampleRate;		//!< Sampling rate
 		float fSpeedOfSound;	//!< Speed of sound, m/s
 		int iOptimization;		//!< Optimization algorithm (future work, see features/room_compensation)
-		float fCrossTalkCancellationFactor; //!< Factor for cross-talk cancellation (none = 0.0, full = 1.0)
-		float fWaveIncidenceAngleCompensationFactor; //!< Factor for cross-talk cancellation (none = 0.0, full = 1.0)
+		float fSweetSpotWideningFactor; //!< Factor for sweet spot widening (none = 0.0, max_wide = 1.0)
 
 		class ITA_CTC_API Loudspeaker
 		{
@@ -176,29 +175,17 @@ public:
 	*/
 	void SetBeta( float fBeta );
 
-	//! Get cross-talk cancellation factor
+	//! Get sweet spot widening factor
 	/**
 	* \return Factor [0..1]
 	*/
-	float GetCrossTalkCancellationFactor();
+	float GetSweetSpotWideningFactor();
 
-	//! Set cross-talk cancellation factor
+	//! Set sweet spot widening parameter
 	/**
 	* \param fFactor number between [0..1] (none: 0, max range = 1.0)
 	*/
-	void SetCrossTalkCancellationFactor( float fFactor );
-
-	//! Get cross-talk cancellation factor
-	/**
-	* \return Factor [0..1]
-	*/
-	float GetWaveIncidenceAngleCompensation();
-
-	//! Set cross-talk cancellation factor
-	/**
-	* \param fFactor number between [0..1] (none: 0, max range = 1.0)
-	*/
-	void SetWaveIncidenceAngleCompensationFactor( float fFactor );
+	void SetSweetSpotWideningFactor( float fFactor );
 
 	//! Get additional delay parameter
 	/**
@@ -295,8 +282,7 @@ private:
 	std::atomic< float > m_fBeta;		//!< Beta parameter (regularization)
 	std::vector< float > m_vfDelayTime;	//!< Add a delay [seconds] to the resulting CTC filter (individual channels)
 	std::atomic <int > m_iOptimization;	//!< Optimization (see Config enum)
-	std::atomic< float > m_fCrossTalkCancellationFactor;		//!< Factor for cross-talk cancellation (none = 0.0, full = 1.0)
-	std::atomic< float > m_fWaveIncidenceAngleCompensationFactor;		//!< Factor for cross-talk cancellation (none = 0.0, full = 1.0)
+	std::atomic< float > m_fSweetSpotWideningFactor;		//!< Factor for sweet spot widening (none = 0.0, max_wide = 1.0)
 	const DAFFContentIR* m_pHRIR;	//!< HRIR dataset pointer
 	
 	Pose m_oHeadPose;				//!< Current head Pose data

src/ITANCTC.cpp

@@ -23,8 +23,7 @@ ITANCTC::ITANCTC( const Config& oNCTCConfig )
 	m_fBeta = float( 1e-4 );
 
 	m_iOptimization = m_oConfig.iOptimization;
-	m_fCrossTalkCancellationFactor = m_oConfig.fCrossTalkCancellationFactor;
-	m_fWaveIncidenceAngleCompensationFactor = m_oConfig.fWaveIncidenceAngleCompensationFactor;
+	m_fSweetSpotWideningFactor = m_oConfig.fSweetSpotWideningFactor;
 
 	m_oHeadPose.vPos.SetToZeroVector();
 	m_oHeadPose.vView.SetValues( 0, 0, -1.0f );
@@ -362,24 +361,14 @@ float ITANCTC::GetBeta()
 	return m_fBeta;
 }
 
-void ITANCTC::SetCrossTalkCancellationFactor( float fFactor )
+void ITANCTC::SetSweetSpotWideningFactor( float fFactor )
 {
-	m_fCrossTalkCancellationFactor = fFactor;
+	m_fSweetSpotWideningFactor = fFactor;
 }
 
-float ITANCTC::GetCrossTalkCancellationFactor()
+float ITANCTC::GetSweetSpotWideningFactor()
 {
-	return m_fCrossTalkCancellationFactor;
-}
-
-void ITANCTC::SetWaveIncidenceAngleCompensationFactor( float fFactor )
-{
-	m_fWaveIncidenceAngleCompensationFactor = fFactor;
-}
-
-float ITANCTC::GetWaveIncidenceAngleCompensation()
-{
-	return m_fWaveIncidenceAngleCompensationFactor;
+	return m_fSweetSpotWideningFactor;
 }
 
 void ITANCTC::SetDelayTime( float fDelayTime )