# HG changeset patch
# User Ulf.Hammarqvist@gmail.com
# Date 1349991617 0
# Node ID daf1ca88fe207aa61e5eadb663eb8f75791c52b8
# Parent  b37ebfb0c8375ebffaa8cf3738f5e8ccf60105bc


diff -r b37ebfb0c837 -r daf1ca88fe20 include/AGC.h
--- a/include/AGC.h	Thu Oct 11 21:33:57 2012 +0000
+++ b/include/AGC.h	Thu Oct 11 21:40:17 2012 +0000
@@ -19,7 +19,8 @@
 
 class AGC_coefficients {
 public:
-  AGC_coefficients(AGC_parameters*, float, int);
+  AGC_coefficients(AGC_parameters* AGC_params_p,
+      float fs, int n_ch);
 
   int n_ch_;
   int n_agc_stages_;
@@ -36,7 +37,7 @@
   float detect_scale_;
   
 private:
-  FloatArray Build_FIR_coeffs(float, float, int*, int*);
+  FloatArray Build_FIR_coeffs(float var, float mn, int* ptr_iters, int* ptr_taps);
 };
 
 #endif /* AGC_H_ */
diff -r b37ebfb0c837 -r daf1ca88fe20 include/CAR.h
--- a/include/CAR.h	Thu Oct 11 21:33:57 2012 +0000
+++ b/include/CAR.h	Thu Oct 11 21:40:17 2012 +0000
@@ -27,7 +27,8 @@
 
 class CAR_coefficients{
 public:
-  CAR_coefficients(CAR_parameters*, float, FloatArray);
+  CAR_coefficients(CAR_parameters* car_params_p, float fs,
+      FloatArray pole_freqs);
 
   FloatArray r1_coeffs_;
   FloatArray a0_coeffs_;
diff -r b37ebfb0c837 -r daf1ca88fe20 include/CARFAC.h
--- a/include/CARFAC.h	Thu Oct 11 21:33:57 2012 +0000
+++ b/include/CARFAC.h	Thu Oct 11 21:40:17 2012 +0000
@@ -11,7 +11,11 @@
 
 class CARFAC{
 public:
-  CARFAC(int, CAR_parameters*, IHC_parameters*, AGC_parameters*, int);
+  CARFAC(int fs,
+      CAR_parameters* car_params,
+      IHC_parameters* ihc_params,
+      AGC_parameters* agc_params,
+      int n_ears);
 
   float fs_;
 
diff -r b37ebfb0c837 -r daf1ca88fe20 include/Ear.h
--- a/include/Ear.h	Thu Oct 11 21:33:57 2012 +0000
+++ b/include/Ear.h	Thu Oct 11 21:40:17 2012 +0000
@@ -14,7 +14,7 @@
 
 class Ear {
 public:
-  Ear(CAR_parameters*, IHC_parameters*, AGC_parameters*, FloatArray, int, float);
+  Ear(CAR_parameters* car_params, IHC_parameters* ihc_params, AGC_parameters* agc_params, FloatArray pole_freqs, int n_ch, float fs);
 
   CAR_parameters car_params_;
   IHC_parameters ihc_params_;
diff -r b37ebfb0c837 -r daf1ca88fe20 include/IHC.h
--- a/include/IHC.h	Thu Oct 11 21:33:57 2012 +0000
+++ b/include/IHC.h	Thu Oct 11 21:40:17 2012 +0000
@@ -15,7 +15,7 @@
 
 class IHC_coefficients{
 public:
-  IHC_coefficients(IHC_parameters*, float, int);
+  IHC_coefficients(IHC_parameters* IHC_params_p, float fs, int n_ch);
 
   float saturation_output_;
 
diff -r b37ebfb0c837 -r daf1ca88fe20 include/unit_conversion.h
--- a/include/unit_conversion.h	Thu Oct 11 21:33:57 2012 +0000
+++ b/include/unit_conversion.h	Thu Oct 11 21:40:17 2012 +0000
@@ -1,6 +1,6 @@
 #ifndef UNIT_CONVERSION_H_
 #define UNIT_CONVERSION_H_
 
-float ERB_Hz(float, float, float);
+float ERB_Hz(float cf_hz, float erb_break_freq, float erb_q);
 
 #endif