explicitly mark sample type as Float32

since AudioUnitSampleType is now deprecated
admsyn · Jul 13, 2014 · c0bc918 · c0bc918
1 parent 468375a
commit c0bc918
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/src/ofxAudioUnitDSPNode.cpp b/src/ofxAudioUnitDSPNode.cpp
@@ -57,7 +57,7 @@ struct DSPNodeContext
 				circularBuffers.resize(bufferCount);
 
 				for(int i = 0; i < circularBuffers.size(); i++) {
-					TPCircularBufferInit(&circularBuffers[i], samplesToBuffer * sizeof(AudioUnitSampleType));
+					TPCircularBufferInit(&circularBuffers[i], samplesToBuffer * sizeof(Float32));
 				}
 				_bufferSize = samplesToBuffer;
 			}
@@ -202,20 +202,20 @@ unsigned int ofxAudioUnitDSPNode::getBufferSize() const
 #pragma mark - Getting Samples
 
 // ----------------------------------------------------------
-void ExtractSamplesFromCircularBuffer(std::vector<AudioUnitSampleType> &outBuffer, TPCircularBuffer * circularBuffer)
+void ExtractSamplesFromCircularBuffer(std::vector<Float32> &outBuffer, TPCircularBuffer * circularBuffer)
 // ----------------------------------------------------------
 {
 	if(!circularBuffer) {
 		outBuffer.clear();
 	} else {
 		int32_t circBufferSize;
-		AudioUnitSampleType * circBufferTail = (AudioUnitSampleType *)TPCircularBufferTail(circularBuffer, &circBufferSize);
-		AudioUnitSampleType * circBufferHead = circBufferTail + (circBufferSize / sizeof(AudioUnitSampleType));
+		Float32 * circBufferTail = (Float32 *)TPCircularBufferTail(circularBuffer, &circBufferSize);
+		Float32 * circBufferHead = circBufferTail + (circBufferSize / sizeof(Float32));
 		outBuffer.assign(circBufferTail, circBufferHead);
 	}
 }
 
-void ofxAudioUnitDSPNode::getSamplesFromChannel(std::vector<AudioUnitSampleType> &samples, unsigned int channel) const
+void ofxAudioUnitDSPNode::getSamplesFromChannel(std::vector<Float32> &samples, unsigned int channel) const
 {
 	if(_impl->ctx.circularBuffers.size() > channel) {
 		ExtractSamplesFromCircularBuffer(samples, &_impl->ctx.circularBuffers[channel]);

diff --git a/src/ofxAudioUnitDSPNode.h b/src/ofxAudioUnitDSPNode.h
@@ -20,7 +20,7 @@ class ofxAudioUnitDSPNode
 	void setSource(AURenderCallbackStruct callback, UInt32 channels = 2);
 
 protected:
-	void getSamplesFromChannel(std::vector<AudioUnitSampleType> &samples, unsigned int channel) const;
+	void getSamplesFromChannel(std::vector<Float32> &samples, unsigned int channel) const;
 
 	// sets the internal circular buffer size
 	void setBufferSize(unsigned int samplesToBuffer);

diff --git a/src/ofxAudioUnitFftNode.h b/src/ofxAudioUnitFftNode.h
@@ -61,6 +61,6 @@ class ofxAudioUnitFftNode : public ofxAudioUnitDSPNode {
 	FFTSetup _fftSetup;
 	COMPLEX_SPLIT _fftData;
 	float * _window;
-	std::vector<AudioUnitSampleType> _sampleBuffer;
+	std::vector<Float32> _sampleBuffer;
 	void freeBuffers();
 };
diff --git a/src/ofxAudioUnitInput.cpp b/src/ofxAudioUnitInput.cpp
@@ -79,7 +79,7 @@ ofxAudioUnitInput::ofxAudioUnitInput(unsigned int samplesToBuffer)
 #endif
 
 	for(int i = 0; i < ASBD.mChannelsPerFrame; i++) {
-		TPCircularBufferInit(&_impl->ctx.circularBuffers[i], samplesToBuffer * sizeof(AudioUnitSampleType));
+		TPCircularBufferInit(&_impl->ctx.circularBuffers[i], samplesToBuffer * sizeof(Float32));
 	}
 }
 
@@ -329,7 +329,7 @@ OSStatus RenderCallback(void *inRefCon,
 			if(circBuffer) {
 				TPCircularBufferProduceBytes(circBuffer,
 											 ctx->bufferList->mBuffers[i].mData,
-											 inNumberFrames * sizeof(AudioUnitSampleType));
+											 inNumberFrames * sizeof(Float32));
 			}
 		}
 	}
@@ -352,8 +352,8 @@ OSStatus PullCallback(void *inRefCon,
 
 	for(int i = 0; i < buffersToCopy; i++) {
 		int32_t circBufferSize;
-		AudioUnitSampleType * circBufferTail = (AudioUnitSampleType *) TPCircularBufferTail(&ctx->circularBuffers[i], &circBufferSize);
-		bool circBufferHasEnoughSamples = circBufferSize / sizeof(AudioUnitSampleType) >= inNumberFrames ? true : false;
+		Float32 * circBufferTail = (Float32 *) TPCircularBufferTail(&ctx->circularBuffers[i], &circBufferSize);
+		bool circBufferHasEnoughSamples = circBufferSize / sizeof(Float32) >= inNumberFrames ? true : false;
 
 		if(!circBufferHasEnoughSamples) {
 			// clear buffer, so bytes that don't get written are silence instead of noise

diff --git a/src/ofxAudioUnitTap.h b/src/ofxAudioUnitTap.h
@@ -28,7 +28,7 @@ class ofxAudioUnitTap : public ofxAudioUnitDSPNode
 	virtual ~ofxAudioUnitTap();
 
 	// Container for samples returned from an ofxAudioUnitTap
-	typedef std::vector<AudioUnitSampleType> MonoSamples;
+	typedef std::vector<Float32> MonoSamples;
 
 	struct StereoSamples
 	{

diff --git a/src/ofxAudioUnitUtils.h b/src/ofxAudioUnitUtils.h
@@ -12,8 +12,8 @@ static AudioBufferList * AudioBufferListAlloc(UInt32 channels, UInt32 samplesPer
 
 	for(UInt32 i = 0; i < bufferList->mNumberBuffers; i++) {
 		bufferList->mBuffers[i].mNumberChannels = 1;
-		bufferList->mBuffers[i].mDataByteSize   = samplesPerChannel * sizeof(AudioUnitSampleType);
-		bufferList->mBuffers[i].mData           = calloc(samplesPerChannel, sizeof(AudioUnitSampleType));
+		bufferList->mBuffers[i].mDataByteSize   = samplesPerChannel * sizeof(Float32);
+		bufferList->mBuffers[i].mData           = calloc(samplesPerChannel, sizeof(Float32));
 	}
 	return bufferList;
 }