diff options
| author | Mick Grierson <mickgrierson@gmail.com> | 2011-10-31 16:40:35 +0000 |
|---|---|---|
| committer | Mick Grierson <mickgrierson@gmail.com> | 2011-10-31 16:40:35 +0000 |
| commit | 8683b03800a2ea9523b8c4b250ed780fd4cf9e6b (patch) | |
| tree | a159b494cdfac9ac501e8cde7e16d0cfb9215701 /maximilian.h | |
| parent | 46ee21d048ec62e9532fb009a3ffa99ced28b149 (diff) | |
updated oxfMaxim to the latest version of maximilian
ofxMaxim now has one shot sample playback with speed, sample loading
takes a channel arg (0 for left, 1 for right, default 0). Triangle wave
fixed, new easy to use envelopes with adsr function, gate and
compressor, minor changes here and there to a few methods.
Diffstat (limited to 'maximilian.h')
| -rwxr-xr-x | maximilian.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/maximilian.h b/maximilian.h index 5062ba5..4ec75d1 100755 --- a/maximilian.h +++ b/maximilian.h @@ -137,6 +137,7 @@ class maxiFilter { double z;//pole double c;//filter coefficient public: + maxiFilter():x(0.0), y(0.0), z(0.0), c(0.0){}; double cutoff; double resonance; double lores(double input,double cutoff1, double resonance); @@ -173,12 +174,12 @@ private: int myByteRate; short myBlockAlign; short myBitsPerSample; - int myDataSize; double position; double speed; double output; public: + int myDataSize; short myChannels; int mySampleRate; long length; @@ -191,7 +192,7 @@ public: ~maxiSample() { - delete myData; + if (myData) delete[] myData; myChunkSize = NULL; mySubChunk1Size = NULL; myFormat = NULL; @@ -203,7 +204,7 @@ public: myDataSize = NULL; } -// maxiSample(); + maxiSample():myData(NULL){}; bool load(string fileName, int channel=0); |
