diff options
| author | Chris Kiefer <chrisk13fer@gmail.com> | 2012-02-22 12:10:20 +0000 |
|---|---|---|
| committer | Chris Kiefer <chrisk13fer@gmail.com> | 2012-02-22 12:10:20 +0000 |
| commit | 0c65d2ad2162db3ffbea3e3175675ad4b4598688 (patch) | |
| tree | 5b1d6bd8b9dbe4069b8bf1a9bddb374d957c2cab /ofxMaxim/ofxMaximiPhone0062Example | |
| parent | 9f073116e8b21af58415204edecf42fec5f2c3ed (diff) | |
| parent | bb60cd352f53f4600913d2152032dd4aff228520 (diff) | |
resolved merge conflicts
Diffstat (limited to 'ofxMaxim/ofxMaximiPhone0062Example')
| -rw-r--r-- | ofxMaxim/ofxMaximiPhone0062Example/ofxMaxim/libs/maximilian.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ofxMaxim/ofxMaximiPhone0062Example/ofxMaxim/libs/maximilian.cpp b/ofxMaxim/ofxMaximiPhone0062Example/ofxMaxim/libs/maximilian.cpp index 0f37cf1..63b9a34 100644 --- a/ofxMaxim/ofxMaximiPhone0062Example/ofxMaxim/libs/maximilian.cpp +++ b/ofxMaxim/ofxMaximiPhone0062Example/ofxMaxim/libs/maximilian.cpp @@ -245,6 +245,7 @@ double maxiDelayline::dl(double input, int size, double feedback, int position) } + //I particularly like these. cutoff between 0 and 1 double maxiFilter::lopass(double input, double cutoff) { output=outputs[0] + cutoff*(input-outputs[0]); |