changeset 644:16dfff1de47a

Fix scons build.

--- a/carfac/SConstruct	Tue Jun 04 18:30:22 2013 +0000
+++ b/carfac/SConstruct	Tue Jun 11 15:04:55 2013 +0000
@@ -51,14 +51,14 @@
   env.MergeFlags(['-std=c++11'])
 
 carfac_sources = [
-    'agc.h',
-    'car.h',
+    'agc.h',
+    'car.h',
+    'carfac.cc',
+    'carfac_output.cc',
+    'carfac_util.cc',
+    'common.h',
+    'ear.cc',
     'ihc.h',
-    'carfac.cc',
-    'common.h',
-    'carfac_util.h',
-    'carfac_output.cc',
-    'ear.cc',
     'sai.cc'
     ]
 env.Library(target = 'carfac', source = carfac_sources)

--- a/carfac/carfac.cc	Tue Jun 04 18:30:22 2013 +0000
+++ b/carfac/carfac.cc	Tue Jun 11 15:04:55 2013 +0000
@@ -79,7 +79,7 @@
       Ear& ear = ears_[audio_channel];
       // This stores the audio sample currently being processed.
       FPType input = sound_data[audio_channel][start + timepoint];
-      
+
       // Now we apply the three stages of the model in sequence to the current
       // audio sample.
       ear.CARStep(input);
@@ -337,7 +337,7 @@
   }
 }
 
-FPType CARFAC::ERBHz (const FPType center_frequency_hz,
-                      const FPType erb_break_freq, const FPType erb_q) {
+FPType CARFAC::ERBHz(const FPType center_frequency_hz,
+                     const FPType erb_break_freq, const FPType erb_q) {
   return (erb_break_freq + center_frequency_hz) / erb_q;
-}
\ No newline at end of file
+}

--- a/carfac/carfac_util.cc	Tue Jun 04 18:30:22 2013 +0000
+++ b/carfac/carfac_util.cc	Tue Jun 11 15:04:55 2013 +0000
@@ -22,7 +22,7 @@
 
 #include "carfac_util.h"
 
-ArrayX CARFACDetect (const ArrayX& x) {
+ArrayX CARFACDetect(const ArrayX& x) {
   ArrayX conductance, z, set;
   FPType a = 0.175;
   // This offsets the low-end tail into negative x territory.
@@ -32,4 +32,4 @@
   // Zero is the final answer for many points.
   conductance = (z < 0).select(0.0, (z*z*z) / (z*z*z + z*z + 0.1));
   return conductance;
-}
\ No newline at end of file
+}