aboutsummaryrefslogtreecommitdiffstats
path: root/ofxMaxim/ofMaximWindowsVS2008_emptyExample/src
diff options
context:
space:
mode:
authorMick Grierson <mickgrierson@gmail.com>2011-12-05 22:44:18 +0000
committerMick Grierson <mickgrierson@gmail.com>2011-12-05 22:44:18 +0000
commit8ec3e7fee6785b2cc35dfe37ffd95b71a1033872 (patch)
treeda75380fad100ae4b168cbf473c4c03a7a11a6ca /ofxMaxim/ofMaximWindowsVS2008_emptyExample/src
parent1aed9a7169c0c21e68b0e1308177cbe5952548d3 (diff)
moving stuff in from my branch
Diffstat (limited to 'ofxMaxim/ofMaximWindowsVS2008_emptyExample/src')
-rwxr-xr-xofxMaxim/ofMaximWindowsVS2008_emptyExample/src/maximilian.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ofxMaxim/ofMaximWindowsVS2008_emptyExample/src/maximilian.cpp b/ofxMaxim/ofMaximWindowsVS2008_emptyExample/src/maximilian.cpp
index a0ee618..adb0068 100755
--- a/ofxMaxim/ofMaximWindowsVS2008_emptyExample/src/maximilian.cpp
+++ b/ofxMaxim/ofMaximWindowsVS2008_emptyExample/src/maximilian.cpp
@@ -515,7 +515,7 @@ double maxiSample::play4(double frequency, double start, double end) {
double maxiSample::bufferPlay(unsigned char &bufferin,long length) {
double remainder;
- short* buffer = (short *)bufferin;
+ short* buffer = (short *)&bufferin;
position=(position+1);
remainder = position - (long) position;
if ((long) position>length) position=0;
@@ -526,7 +526,7 @@ double maxiSample::bufferPlay(unsigned char &bufferin,long length) {
double maxiSample::bufferPlay(unsigned char &bufferin,double speed,long length) {
double remainder;
long a,b;
- short* buffer = (short *)bufferin;
+ short* buffer = (short *)&bufferin;
position=position+((speed*chandiv*myChannels)/(samplerate/mySampleRate));
if (speed >=0) {
@@ -573,7 +573,7 @@ double maxiSample::bufferPlay(unsigned char &bufferin,double frequency, double s
double remainder;
length=end;
long a,b;
- short* buffer = (short *)bufferin;
+ short* buffer = (short *)&bufferin;
if (frequency >0.) {
if (position<start) {
position=start;
@@ -629,7 +629,7 @@ double maxiSample::bufferPlay(unsigned char &bufferin,double frequency, double s
double maxiSample::bufferPlay4(unsigned char &bufferin,double frequency, double start, double end) {
double remainder;
double a,b,c,d,a1,a2,a3;
- short* buffer = (short*)bufferin;
+ short* buffer = (short*)&bufferin;
if (frequency >0.) {
if (position<start) {
position=start;