diff src/CAR.h @ 484:715fc47a965e carfac_cpp

stubbed some more, and tidying
author Ulf.Hammarqvist@gmail.com
date Sat, 31 Mar 2012 17:24:08 +0000
parents 3673e3e67bab
children 181df875bf84
line wrap: on
line diff
--- a/src/CAR.h	Thu Mar 29 19:43:36 2012 +0000
+++ b/src/CAR.h	Sat Mar 31 17:24:08 2012 +0000
@@ -1,26 +1,29 @@
 #ifndef CAR_H_
 #define CAR_H_
 
-#include "CARFAC_common_typedefs.h"
+#include "CARFAC_common.h"
 #include <cmath>
 
-class CAR_parameters {
+class CAR_parameters{
 public:
-  CAR_parameters()
+  CAR_parameters():
+    velocity_scale_(0.2),
+    v_offset_(0.01),
+    v2_corner_(0.2),
+    v_damp_max_(0.01),
+    min_zeta_(0.10),
+    first_pole_theta_(0.085*kPi),
+    zero_ratio_(sqrt(2)),
+    high_f_damping_compression_(0.5),
+    erb_per_step_(0.5),
+    min_pole_hz_(30)
   {
-    velocity_scale_ = 0.2;
-    v_offset_ = 0.01;
-    v2_corner_ = 0.2;
-    v_damp_max_ = 0.01;
-    min_zeta_ = 0.10;
-    first_pole_theta_ = 0.085*kPi;
-    zero_ratio_ = sqrt(2);
-    high_f_damping_compression_ = 0.5;
-    erb_per_step_ = 0.5;
-    min_pole_Hz_ = 30;
+    // do nothing more
   }
 
-  virtual ~CAR_parameters(){}
+  virtual ~CAR_parameters(){
+    // do nothing
+  }
 
   float velocity_scale_;
   float v_offset_;
@@ -31,7 +34,7 @@
   float zero_ratio_;
   float high_f_damping_compression_;
   float erb_per_step_;
-  float min_pole_Hz_;
+  float min_pole_hz_;
 };
 
 class CAR_coefficients{
@@ -39,7 +42,7 @@
   CAR_coefficients(CAR_parameters*, float, FloatArray);
   virtual ~CAR_coefficients();
 private:
-  CAR_coefficients(){}
+  CAR_coefficients();
 };
 
 #endif /* CAR_H_ */