aboutsummaryrefslogtreecommitdiffstats
path: root/ofxMaxim/ofxMaximExamples007OSX
diff options
context:
space:
mode:
authorMick Grierson <mickgrierson@gmail.com>2011-11-11 17:28:08 +0000
committerMick Grierson <mickgrierson@gmail.com>2011-11-11 17:28:08 +0000
commit8a070a5939f3efddb5d719a3a9e787eb3a4862e4 (patch)
tree8e6b8123f41b95b807af508e4b3ceef035f894e9 /ofxMaxim/ofxMaximExamples007OSX
parent8f41c4ec048a97de3ef9840b66795f41c628851d (diff)
rewrote the delay line
Diffstat (limited to 'ofxMaxim/ofxMaximExamples007OSX')
-rw-r--r--ofxMaxim/ofxMaximExamples007OSX/ofMaximExample007OSX/ofxMaxim/libs/maximilian.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/ofxMaxim/ofxMaximExamples007OSX/ofMaximExample007OSX/ofxMaxim/libs/maximilian.cpp b/ofxMaxim/ofxMaximExamples007OSX/ofMaximExample007OSX/ofxMaxim/libs/maximilian.cpp
index e75ddf5..102ef15 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/ofMaximExample007OSX/ofxMaxim/libs/maximilian.cpp
+++ b/ofxMaxim/ofxMaximExamples007OSX/ofMaximExample007OSX/ofxMaxim/libs/maximilian.cpp
@@ -228,9 +228,9 @@ double maxiDelayline::dl(double input, int size, double feedback) {
if ( phase >=size ) {
phase = 0;
}
+ output=memory[phase];
memory[phase]=(memory[phase]*feedback)+(input*feedback)*0.5;
phase+=1;
- output=memory[phase];
return(output);
}
@@ -238,13 +238,14 @@ double maxiDelayline::dl(double input, int size, double feedback) {
double maxiDelayline::dl(double input, int size, double feedback, int position) {
if ( phase >=size ) phase = 0;
if ( position >=size ) position = 0;
- memory[phase]=(memory[phase]*feedback)+(input*feedback)*chandiv;
+ output=memory[position];
+ memory[phase]=(memory[phase]*feedback)+(input*feedback)*chandiv;
phase+=1;
- output=memory[position];
return(output);
}
+
//I particularly like these. cutoff between 0 and 1
double maxiFilter::lopass(double input, double cutoff) {
output=outputs[0] + cutoff*(input-outputs[0]);