# HG changeset patch
# User Ulf.Hammarqvist@gmail.com
# Date 1332953086 0
# Node ID 0972b3161871cc332b79da827b8c737e58842eb4
# Parent  750075ee8e3a7becd661dfb9fdcb41ad1b63b64a
stubilub lolipop

diff -r 750075ee8e3a -r 0972b3161871 branches/carfac_cpp/src/AGC.h
--- a/branches/carfac_cpp/src/AGC.h	Wed Mar 28 16:08:11 2012 +0000
+++ b/branches/carfac_cpp/src/AGC.h	Wed Mar 28 16:44:46 2012 +0000
@@ -1,10 +1,22 @@
 #ifndef AGC_H_
 #define AGC_H_
 
+#include "CARFAC_common_typedefs.h"
+
 class AGC_parameters {
 public:
 	AGC_parameters();
 	virtual ~AGC_parameters();
+
+	float n_stages;
+	FloatArray time_constants;
+	float AGC_stage_gain;
+	FloatArray decimation;
+	FloatArray AGC1_scales;
+	FloatArray AGC2_scales;
+	float detect_scale;
+	float AGC_mix_coeff;
+
 };
 
 class AGC_coefficients {
diff -r 750075ee8e3a -r 0972b3161871 branches/carfac_cpp/src/CAR.h
--- a/branches/carfac_cpp/src/CAR.h	Wed Mar 28 16:08:11 2012 +0000
+++ b/branches/carfac_cpp/src/CAR.h	Wed Mar 28 16:44:46 2012 +0000
@@ -14,6 +14,18 @@
 public:
 	CAR_parameters();
 	virtual ~CAR_parameters();
+
+	float velocity_scale;
+	float v_offset;
+	float v2_corner;
+	float v_damp_max;
+	float min_zeta;
+	float first_pole_theta;
+	float zero_ratio;
+	float high_f_damping_compression;
+	float ERB_per_step;
+	float min_pole_Hz;
+
 };
 
 class CAR_coefficients{
diff -r 750075ee8e3a -r 0972b3161871 branches/carfac_cpp/src/CARFAC_common_typedefs.h
--- a/branches/carfac_cpp/src/CARFAC_common_typedefs.h	Wed Mar 28 16:08:11 2012 +0000
+++ b/branches/carfac_cpp/src/CARFAC_common_typedefs.h	Wed Mar 28 16:44:46 2012 +0000
@@ -5,9 +5,8 @@
 
 typedef std::vector<float> FloatArray;
 
-#define DEFAULT_ERB_break_freq 228.833
-#define DEFAULT_ERB_Q 9.2645
-
-#define DEFAULT_FS 44100
+#define DEFAULT_ERB_break_freq 165.3
+#define DEFAULT_ERB_Q 1000/(24.7*4.37)
+#define DEFAULT_FS 22050
 
 #endif /* CARFAC_COMMON_TYPEDEFS_H_ */
diff -r 750075ee8e3a -r 0972b3161871 branches/carfac_cpp/src/IHC.h
--- a/branches/carfac_cpp/src/IHC.h	Wed Mar 28 16:08:11 2012 +0000
+++ b/branches/carfac_cpp/src/IHC.h	Wed Mar 28 16:44:46 2012 +0000
@@ -1,10 +1,17 @@
 #ifndef IHC_H_
 #define IHC_H_
 
+// not sure how to best deal with the "three style" IHC - ulha
 class IHC_parameters {
 public:
 	IHC_parameters();
 	virtual ~IHC_parameters();
+
+	float tau_lpf;
+	float tau1_out;
+	float tau1_in;
+	float tau2_out;
+	float tau2_in;
 };
 
 class IHC_coefficients {