diff options
| -rwxr-xr-x | main.cpp | 4 | ||||
| -rw-r--r-- | maximilian.cpp | 10 | ||||
| -rw-r--r-- | maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout | 6 | ||||
| -rw-r--r-- | maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mick.xcuserdatad/UserInterfaceState.xcuserstate | bin | 33130 -> 34420 bytes |
4 files changed, 11 insertions, 9 deletions
@@ -1,6 +1,7 @@ #include "maximilian.h" maxiOsc myCounter,mySwitchableOsc;// +maxiSample beat; int CurrentCount;// double myOscOutput,myFilteredOutput;// double myEnvelopeData[6] = {500,0,1000,500,0,500};//this data will be used to make an envelope. Value and time to value in ms. @@ -9,6 +10,7 @@ maxiFilter myFilter; void setup() {//some inits myEnvelope.amplitude=myEnvelopeData[0]; //initialise the envelope + beat.load("/Users/mick/Documents/workspace/Maximilian/beat2.wav"); } void play(double *output) { @@ -29,5 +31,5 @@ void play(double *output) { myFilteredOutput=myFilter.lores(myOscOutput,(myEnvelope.line(6, myEnvelopeData)),10);//lores takes an audio input, a frequency and a resonance factor (1-100) - *output=myFilteredOutput;//point me at your speakers and fire. + *output=myFilteredOutput/2+beat.play(-1.,0,beat.length);//point me at your speakers and fire. } diff --git a/maximilian.cpp b/maximilian.cpp index 09ef764..6ca26bd 100644 --- a/maximilian.cpp +++ b/maximilian.cpp @@ -742,7 +742,7 @@ double maxiSample::play(double frequency, double start, double end, double &pos) } if ( pos >= end ) pos = start; - pos += ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv))); + pos += ((end-start)/((maxiSettings::sampleRate)/(frequency*chandiv))); remainder = pos - floor(pos); long posl = floor(pos); if (posl+1<length) { @@ -762,7 +762,7 @@ double maxiSample::play(double frequency, double start, double end, double &pos) output = (double) ((1-remainder) * temp[a] + remainder * temp[b])/32767;//linear interpolation } else { - frequency=frequency-(frequency+frequency); + frequency*=-1.; if ( pos <= start ) pos = end; pos -= ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv))); remainder = pos - floor(pos); @@ -827,7 +827,7 @@ double maxiSample::play4(double frequency, double start, double end) { output = (double) (((a3 * remainder + a2) * remainder + a1) * remainder + b) / 32767; } else { - frequency=frequency-(frequency+frequency); + frequency*=-1.; if ( position <= start ) position = end; position -= ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv))); remainder = position - floor(position); @@ -952,7 +952,7 @@ double maxiSample::bufferPlay(unsigned char &bufferin,double frequency, double s output = (double) ((1-remainder) * buffer[a] + remainder * buffer[b])/32767;//linear interpolation } else { - frequency=frequency-(frequency+frequency); + frequency*=-1.; if ( position <= start ) position = end; position -= ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv))); remainder = position - floor(position); @@ -1017,7 +1017,7 @@ double maxiSample::bufferPlay4(unsigned char &bufferin,double frequency, double output = (double) (((a3 * remainder + a2) * remainder + a1) * remainder + b) / 32767; } else { - frequency=frequency-(frequency+frequency); + frequency*=-1.; if ( position <= start ) position = end; position -= ((end-start)/(maxiSettings::sampleRate/(frequency*chandiv))); remainder = position - floor(position); diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout b/maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout index b636a35..5d2d0a5 100644 --- a/maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout +++ b/maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout @@ -11,17 +11,17 @@ <key>IDESourceControlProjectOriginsDictionary</key> <dict> <key>9EA75D55FA54A28D61D05E99737654AEBBBF0FB9</key> - <string>ssh://github.com/micknoise/Maximilian.git</string> + <string>https://github.com/micknoise/Maximilian.git</string> </dict> <key>IDESourceControlProjectPath</key> - <string>maximilianTest.xcodeproj/project.xcworkspace</string> + <string>maximilianTest.xcodeproj</string> <key>IDESourceControlProjectRelativeInstallPathDictionary</key> <dict> <key>9EA75D55FA54A28D61D05E99737654AEBBBF0FB9</key> <string>../..</string> </dict> <key>IDESourceControlProjectURL</key> - <string>ssh://github.com/micknoise/Maximilian.git</string> + <string>https://github.com/micknoise/Maximilian.git</string> <key>IDESourceControlProjectVersion</key> <integer>111</integer> <key>IDESourceControlProjectWCCIdentifier</key> diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mick.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mick.xcuserdatad/UserInterfaceState.xcuserstate Binary files differindex 34021e4..0bd34eb 100644 --- a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mick.xcuserdatad/UserInterfaceState.xcuserstate +++ b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mick.xcuserdatad/UserInterfaceState.xcuserstate |