diff options
| -rw-r--r-- | ofxMaxim/ofMaximExample007OSX/ofxMaxim/libs/maximilian.cpp | 4 | ||||
| -rw-r--r-- | ofxMaxim/ofxMaxim/libs/maximilian.cpp | 4 | ||||
| -rw-r--r-- | ofxMaxim/ofxMaximiPhone0062Example/ofxMaxim/libs/maximilian.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ofxMaxim/ofMaximExample007OSX/ofxMaxim/libs/maximilian.cpp b/ofxMaxim/ofMaximExample007OSX/ofxMaxim/libs/maximilian.cpp index b5bf5ed..bc1c67f 100644 --- a/ofxMaxim/ofMaximExample007OSX/ofxMaxim/libs/maximilian.cpp +++ b/ofxMaxim/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,9 +238,9 @@ 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; + output=memory[position]; memory[phase]=(memory[phase]*feedback)+(input*feedback)*chandiv; phase+=1; - output=memory[position]; return(output); } diff --git a/ofxMaxim/ofxMaxim/libs/maximilian.cpp b/ofxMaxim/ofxMaxim/libs/maximilian.cpp index b5bf5ed..bc1c67f 100644 --- a/ofxMaxim/ofxMaxim/libs/maximilian.cpp +++ b/ofxMaxim/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,9 +238,9 @@ 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; + output=memory[position]; memory[phase]=(memory[phase]*feedback)+(input*feedback)*chandiv; phase+=1; - output=memory[position]; return(output); } diff --git a/ofxMaxim/ofxMaximiPhone0062Example/ofxMaxim/libs/maximilian.cpp b/ofxMaxim/ofxMaximiPhone0062Example/ofxMaxim/libs/maximilian.cpp index b5bf5ed..bc1c67f 100644 --- a/ofxMaxim/ofxMaximiPhone0062Example/ofxMaxim/libs/maximilian.cpp +++ b/ofxMaxim/ofxMaximiPhone0062Example/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,9 +238,9 @@ 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; + output=memory[position]; memory[phase]=(memory[phase]*feedback)+(input*feedback)*chandiv; phase+=1; - output=memory[position]; return(output); } |