diff options
Diffstat (limited to 'audioin/src/ofApp.h')
| -rw-r--r-- | audioin/src/ofApp.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/audioin/src/ofApp.h b/audioin/src/ofApp.h index cecc23e..d62dfa0 100644 --- a/audioin/src/ofApp.h +++ b/audioin/src/ofApp.h @@ -2,26 +2,31 @@ #include "ofMain.h" -#include <baudvine/ringbuf.h> +//#include <baudvine/ringbuf.h> #define SAMPLERATE 48000 #define min(a,b) (a<b?a:b) +#define max(a,b) (a>b?a:b) class Buffer{ public: Buffer(size_t sz=0){ if (sz){ data =new float[sz]; + memset(data,0,sz*sizeof(float)); size=sz; } + else data=NULL; } ~Buffer(){ - delete data; + if (data){ + //delete[] data; //why is this throwing an error + } } void add(float * input, int num){ - memcpy(&data[writePoint],input,min(num,size-writePoint)*4); + memcpy(&data[writePoint],input,min(num,size-writePoint)*sizeof(float)); if (size-writePoint<num){ - memcpy(data,&input[size-writePoint],(num-(size-writePoint))*4); + memcpy(data,&input[(size-writePoint)],(num-(size-writePoint))*sizeof(float)); writePoint=num-(size-writePoint); } else writePoint+=num; @@ -65,4 +70,6 @@ class ofApp : public ofBaseApp{ float hScale; float vScale; + + float lineWidth; }; |
