diff options
| author | Chris Kiefer <chrisk13fer@gmail.com> | 2011-12-09 10:53:19 +0000 |
|---|---|---|
| committer | Chris Kiefer <chrisk13fer@gmail.com> | 2011-12-09 10:53:19 +0000 |
| commit | c8963a4de178b46b6e230ea99dba1bb1ee850331 (patch) | |
| tree | 43db4ea34ccf879c97cd4bc69b3256f55d186f31 /maximilian.cpp | |
| parent | f0436cdcb2fac9ec28dc4feb3aad7d8898103d2c (diff) | |
| parent | 8ec3e7fee6785b2cc35dfe37ffd95b71a1033872 (diff) | |
Merge branch 'master' of github.com:micknoise/Maximilian
Diffstat (limited to 'maximilian.cpp')
| -rw-r--r-- | maximilian.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maximilian.cpp b/maximilian.cpp index 44a6fb6..538e3fb 100644 --- a/maximilian.cpp +++ b/maximilian.cpp @@ -658,7 +658,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; @@ -669,7 +669,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)/(maxiSettings::sampleRate/mySampleRate)); if (speed >=0) { @@ -716,7 +716,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; @@ -772,7 +772,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; |