Mercurial > hg > aimc
changeset 478:83e813152671 carfac_cpp
rewrote CARFAC to have pointers as members
| author | Ulf.Hammarqvist@gmail.com |
|---|---|
| date | Wed, 28 Mar 2012 16:08:11 +0000 |
| parents | c03e8ead1862 |
| children | 7eba2f13aa13 |
| files | src/AGC.cpp src/AGC.h src/CAR.cpp src/CAR.h src/CARFAC.cpp src/CARFAC.h src/CARFAC_common_typedefs.h src/IHC.cpp src/IHC.h |
| diffstat | 9 files changed, 24 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/src/AGC.cpp Wed Mar 28 07:12:22 2012 +0000 +++ b/src/AGC.cpp Wed Mar 28 16:08:11 2012 +0000 @@ -1,10 +1,3 @@ -/* - * AGCparameters.cpp - * - * Created on: 25 mar 2012 - * Author: ulha - */ - #include "AGC.h" AGC_parameters::AGC_parameters() { @@ -26,4 +19,3 @@ AGC_coefficients::~AGC_coefficients() { // TODO Auto-generated destructor stub } -
--- a/src/AGC.h Wed Mar 28 07:12:22 2012 +0000 +++ b/src/AGC.h Wed Mar 28 16:08:11 2012 +0000 @@ -1,10 +1,3 @@ -/* - * AGC.h - * - * Created on: 25 mar 2012 - * Author: ulha - */ - #ifndef AGC_H_ #define AGC_H_
--- a/src/CAR.cpp Wed Mar 28 07:12:22 2012 +0000 +++ b/src/CAR.cpp Wed Mar 28 16:08:11 2012 +0000 @@ -1,10 +1,3 @@ -/* - * CAR.cpp - * - * Created on: 24 mar 2012 - * Author: ulha - */ - #include "CAR.h" #include "CARFAC_common_typedefs.h" @@ -18,7 +11,7 @@ // -- // -CAR_coefficients::CAR_coefficients(CAR_parameters CAR_params, float fs, FloatArray pole_freqs) { +CAR_coefficients::CAR_coefficients(CAR_parameters* CAR_params, float fs, FloatArray pole_freqs) { // TODO Auto-generated constructor stub }
--- a/src/CAR.h Wed Mar 28 07:12:22 2012 +0000 +++ b/src/CAR.h Wed Mar 28 16:08:11 2012 +0000 @@ -18,9 +18,10 @@ class CAR_coefficients{ public: - CAR_coefficients(){} - CAR_coefficients(CAR_parameters, float, FloatArray); + CAR_coefficients(CAR_parameters*, float, FloatArray); virtual ~CAR_coefficients(); +private: + CAR_coefficients(){}; }; #endif /* CAR_H_ */
--- a/src/CARFAC.cpp Wed Mar 28 07:12:22 2012 +0000 +++ b/src/CARFAC.cpp Wed Mar 28 16:08:11 2012 +0000 @@ -1,10 +1,3 @@ -/* - * CARFAC.cpp - * - * Created on: 24 mar 2012 - * Author: ulha - */ - #include "CARFAC.h" #include "CAR.h" #include "IHC.h" @@ -13,9 +6,9 @@ #include "CARFAC_common_typedefs.h" CARFAC::CARFAC(int fs = DEFAULT_FS, - CAR_parameters _CAR_params = CAR_parameters(), - IHC_parameters _IHC_params = IHC_parameters(), - AGC_parameters _AGC_params = AGC_parameters(), + CAR_parameters* _CAR_params = new CAR_parameters(), + IHC_parameters* _IHC_params = new IHC_parameters(), + AGC_parameters* _AGC_params = new AGC_parameters(), float ERB_break_freq = DEFAULT_ERB_break_freq, float ERB_Q = DEFAULT_ERB_Q){ @@ -24,11 +17,18 @@ AGC_params = _AGC_params; FloatArray pole_freqs; //TODO: do it, or push it down to CAR_coefficients level instead - CAR_coeffs = CAR_coefficients(CAR_params, fs, pole_freqs); + CAR_coeffs = new CAR_coefficients(CAR_params, fs, pole_freqs); // etc ... } CARFAC::~CARFAC() { - // TODO Auto-generated destructor stub + delete CAR_coeffs; + delete CAR_params; + + delete IHC_coeffs; + delete IHC_params; + + delete AGC_coeffs; + delete AGC_params; }
--- a/src/CARFAC.h Wed Mar 28 07:12:22 2012 +0000 +++ b/src/CARFAC.h Wed Mar 28 16:08:11 2012 +0000 @@ -1,10 +1,3 @@ -/* - * CARFAC.h - * - * Created on: 24 mar 2012 - * Author: ulha - */ - #ifndef CARFAC_H_ #define CARFAC_H_ @@ -12,19 +5,19 @@ #include "IHC.h" #include "AGC.h" -class CARFAC { +class CARFAC{ public: - CARFAC(int, CAR_parameters, IHC_parameters, AGC_parameters, float, float); + CARFAC(int, CAR_parameters*, IHC_parameters*, AGC_parameters*, float, float); virtual ~CARFAC(); - CAR_coefficients CAR_coeffs; - CAR_parameters CAR_params; + CAR_coefficients* CAR_coeffs; + CAR_parameters* CAR_params; - IHC_coefficients IHC_coeffs; - IHC_parameters IHC_params; + IHC_coefficients* IHC_coeffs; + IHC_parameters* IHC_params; - AGC_coefficients AGC_coeffs; - AGC_parameters AGC_params; + AGC_coefficients* AGC_coeffs; + AGC_parameters* AGC_params; }; #endif /* CARFAC_H_ */
--- a/src/CARFAC_common_typedefs.h Wed Mar 28 07:12:22 2012 +0000 +++ b/src/CARFAC_common_typedefs.h Wed Mar 28 16:08:11 2012 +0000 @@ -1,10 +1,3 @@ -/* - * CARFAC_common_typedefs.h - * - * Created on: 25 mar 2012 - * Author: ulha - */ - #ifndef CARFAC_COMMON_TYPEDEFS_H_ #define CARFAC_COMMON_TYPEDEFS_H_