- Use C++ Farrow interpolation

git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@92 b431acfa-c32f-4a4a-93f1-934dc6c82436
2014-12-20 20:55:28 +00:00
parent 8943af5976
commit 1b4d8e9f54
2 changed files with 7 additions and 52 deletions
@@ -16,6 +16,7 @@

 #include <radio/FirComplex.hpp>
 #include <radio/Equalizer.hpp>
+#include <radio/Interpolation.hpp>

 using namespace Radio;

@@ -95,12 +96,6 @@ enum str_state
 	str_state_track
 };

-typedef struct _ml_farrow_coef_hdr_t
-{
-	uint32_t M;
-	uint32_t N;
-} ml_farrow_coef_hdr_t;
-
 typedef struct _minmax_t
 {
 	float min, max;
@@ -316,7 +311,7 @@ private:
 	// Interpolators
 	ppip_cpx_t *m_pPolyphaseInterpolator;
 	lgip_cpx_t *m_pLagrangeInterpolator;
-	ppip_farrow_cpx_t *m_pFarrowInterpolator;
+	Interpolation::Farrow m_farrow;

 	// NCOs
 	nco_t m_nco_ddc, m_nco_cpr;