aboutsummaryrefslogtreecommitdiffstats
path: root/ofxMaxim
diff options
context:
space:
mode:
authorChris Kiefer <chrisk13fer@gmail.com>2012-03-01 22:50:08 +0000
committerChris Kiefer <chrisk13fer@gmail.com>2012-03-01 22:50:08 +0000
commit090d3337fc0eca232ea1cc6ef5aa4f3c7d523e9f (patch)
tree97b84b28a8d5c766c08cd3812a945c96c60349f8 /ofxMaxim
parentd647b04d1526e87981fa202fd1549fa6c3cc106e (diff)
512.f
Diffstat (limited to 'ofxMaxim')
-rw-r--r--ofxMaxim/ofxMaxim/libs/maxiAtoms.cpp3
-rw-r--r--ofxMaxim/ofxMaxim/libs/maxiAtoms.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/ofxMaxim/ofxMaxim/libs/maxiAtoms.cpp b/ofxMaxim/ofxMaxim/libs/maxiAtoms.cpp
index d653d6e..cdc8a3b 100644
--- a/ofxMaxim/ofxMaxim/libs/maxiAtoms.cpp
+++ b/ofxMaxim/ofxMaxim/libs/maxiAtoms.cpp
@@ -13,6 +13,7 @@
#include "sineTable.h"
#ifdef __APPLE_CC__
#include <Accelerate/Accelerate.h>
+#warning ofxMaxim: Please link against the accelerate framework.
#endif
//#include "tinyxml.h"
@@ -68,7 +69,7 @@ inline void maxiCollider::createGabor(flArr &atom, const float freq, const float
float waveTableLength = 512;
vDSP_vsmul(&interpConstants[0], 1, &waveTableLength, &interpConstants[0], 1, length);
for(uint i=0; i < length; i++) {
- interpConstants[i] = fmod(interpConstants[i], 512.0);
+ interpConstants[i] = fmod(interpConstants[i], 512.0f);
}
vDSP_vlint(sineBuffer2, &interpConstants[0], 1, &sine[0], 1, length, 514);
vDSP_vmul(&atom[0], 1, &sine[0], 1, &atom[0], 1, length);
diff --git a/ofxMaxim/ofxMaxim/libs/maxiAtoms.h b/ofxMaxim/ofxMaxim/libs/maxiAtoms.h
index ad682e0..252b770 100644
--- a/ofxMaxim/ofxMaxim/libs/maxiAtoms.h
+++ b/ofxMaxim/ofxMaxim/libs/maxiAtoms.h
@@ -74,7 +74,7 @@ public:
unsigned int numSamples;
unsigned int sampleRate;
maxiAtomBookData atoms;
- //commented out for now, need to resolve tinyxml linker issues
+ //commented out for now, need to resolve tinyxml linker issues - we need tinyxml in the distrib, but it clashes if you also import ofxXmlSettings
// static bool loadMPTKXmlBook(string filename, maxiAtomBook &book);
};