[aimc] r293 committed - Fix scons build.

[ai...@googlecode.com]

Revision: 293
Author: ro...@google.com
Date: Tue Jun 11 08:04:55 2013
Log: Fix scons build.

http://code.google.com/p/aimc/source/detail?r=293

Modified:
/trunk/carfac/SConstruct
/trunk/carfac/carfac.cc
/trunk/carfac/carfac_util.cc

=======================================
--- /trunk/carfac/SConstruct Tue Jun 4 11:30:22 2013
+++ /trunk/carfac/SConstruct Tue Jun 11 08:04:55 2013
@@ -53,12 +53,12 @@
carfac_sources = [
'agc.h',
'car.h',
- 'ihc.h',
'carfac.cc',
- 'common.h',
- 'carfac_util.h',
'carfac_output.cc',
+ 'carfac_util.cc',
+ 'common.h',
'ear.cc',
+ 'ihc.h',
'sai.cc'
]
env.Library(target = 'carfac', source = carfac_sources)
=======================================
--- /trunk/carfac/carfac.cc Tue Jun 4 11:30:22 2013
+++ /trunk/carfac/carfac.cc Tue Jun 11 08:04:55 2013
@@ -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;
}
=======================================
--- /trunk/carfac/carfac_util.cc Tue Jun 4 11:30:22 2013
+++ /trunk/carfac/carfac_util.cc Tue Jun 11 08:04:55 2013
@@ -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.