Merge pull request #20 from mike-es/master

Improved memory usage
alexbw · Jul 7, 2012 · b056c50 · b056c50
2 parents 86a85aa + d8290e5
commit b056c50
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 16 deletions.
diff --git a/Novocaine.xcodeproj/project.pbxproj b/Novocaine.xcodeproj/project.pbxproj
@@ -120,14 +120,6 @@
 		FA552628152A63A4003D9601 = {
 			isa = PBXGroup;
 			children = (
-				FA5526EB152A6466003D9601 /* Accelerate.framework */,
-				FA5526EC152A6466003D9601 /* AudioToolbox.framework */,
-				FA5526ED152A6466003D9601 /* AudioUnit.framework */,
-				FA5526EE152A6466003D9601 /* CoreAudio.framework */,
-				FA55269D152A6405003D9601 /* Accelerate.framework */,
-				FA55269E152A6405003D9601 /* AudioToolbox.framework */,
-				FA55269F152A6405003D9601 /* AudioUnit.framework */,
-				FA5526A0152A6405003D9601 /* CoreAudio.framework */,
 				FA552694152A63F6003D9601 /* Novocaine */,
 				FA55267F152A63B6003D9601 /* Novocaine Mac Example */,
 				FA5526D3152A6452003D9601 /* Novocaine iOS Example */,
@@ -148,9 +140,17 @@
 		FA552636152A63A4003D9601 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				FA552637152A63A4003D9601 /* UIKit.framework */,
-				FA552639152A63A4003D9601 /* Foundation.framework */,
+				FA5526EB152A6466003D9601 /* Accelerate.framework */,
+				FA55269D152A6405003D9601 /* Accelerate.framework */,
+				FA5526EC152A6466003D9601 /* AudioToolbox.framework */,
+				FA55269E152A6405003D9601 /* AudioToolbox.framework */,
+				FA5526ED152A6466003D9601 /* AudioUnit.framework */,
+				FA55269F152A6405003D9601 /* AudioUnit.framework */,
+				FA5526EE152A6466003D9601 /* CoreAudio.framework */,
+				FA5526A0152A6405003D9601 /* CoreAudio.framework */,
 				FA55263B152A63A4003D9601 /* CoreGraphics.framework */,
+				FA552639152A63A4003D9601 /* Foundation.framework */,
+				FA552637152A63A4003D9601 /* UIKit.framework */,
 				FA55265D152A63AE003D9601 /* Cocoa.framework */,
 				FA55265F152A63AE003D9601 /* Other Frameworks */,
 			);
@@ -193,8 +193,8 @@
 		FA552694152A63F6003D9601 /* Novocaine */ = {
 			isa = PBXGroup;
 			children = (
-				FA2015EC154B0DA700F8D3AC /* AudioFileWriter.m */,
 				FA2015EB154B0D9B00F8D3AC /* AudioFileWriter.h */,
+				FA2015EC154B0DA700F8D3AC /* AudioFileWriter.m */,
 				FA552695152A63F6003D9601 /* Novocaine.h */,
 				FA552696152A63F6003D9601 /* Novocaine.m */,
 				FA552697152A63F6003D9601 /* RingBuffer.h */,

diff --git a/Novocaine/AudioFileReader.h b/Novocaine/AudioFileReader.h
@@ -58,6 +58,7 @@
 //- (float)getCurrentTime;
 - (void)play;
 - (void)pause;
+- (void)stop;
 
 
 @end
diff --git a/Novocaine/AudioFileReader.mm b/Novocaine/AudioFileReader.mm
@@ -32,7 +32,6 @@ @interface AudioFileReader ()
     RingBuffer *ringBuffer;
 }
 
-@property RingBuffer *ringBuffer;
 @property AudioStreamBasicDescription outputFormat;
 @property ExtAudioFileRef inputFile;
 @property UInt32 outputBufferSize;
@@ -52,7 +51,6 @@ - (void)bufferNewAudio;
 
 @implementation AudioFileReader
 
-@synthesize ringBuffer = _ringBuffer;
 @synthesize outputFormat = _outputFormat;
 @synthesize inputFile = _inputFile;
 @synthesize outputBuffer = _outputBuffer;
@@ -279,5 +277,14 @@ - (void)pause
     }
 }
 
+- (void)stop
+{
+    // Release the dispatch timer because it holds a reference to this class instance
+    if (self.callbackTimer) {
+        dispatch_release(self.callbackTimer);
+        self.playing = FALSE;
+    }
+}
+
 
 @end
diff --git a/Novocaine/Novocaine.m b/Novocaine/Novocaine.m
@@ -154,12 +154,16 @@ - (id)init
 #pragma mark - Block Handling
 - (void)setInputBlock:(InputBlock)newInputBlock
 {
+    InputBlock tmpBlock = inputBlock;
     inputBlock = Block_copy(newInputBlock);
+    Block_release(tmpBlock);
 }
 
 - (void)setOutputBlock:(OutputBlock)newOutputBlock
 {
+    OutputBlock tmpBlock = outputBlock;
     outputBlock = Block_copy(newOutputBlock);
+    Block_release(tmpBlock);
 }
 
 
@@ -786,6 +790,7 @@ - (void)checkAudioSource {
     CFStringRef route;
     CheckError( AudioSessionGetProperty(kAudioSessionProperty_AudioRoute, &propertySize, &route), "Couldn't check the audio route");
     self.inputRoute = (NSString *)route;
+    CFRelease(route);
     NSLog(@"AudioRoute: %@", self.inputRoute);
 
 

diff --git a/Novocaine/RingBuffer.h b/Novocaine/RingBuffer.h
@@ -32,7 +32,7 @@ class RingBuffer {
 public:	
 	RingBuffer() {};
 	RingBuffer(SInt64 bufferLength, SInt64 numChannels);
-	~RingBuffer() {};
+	~RingBuffer();
 
 	void AddNewSInt16AudioBuffer(const AudioBuffer aBuffer);
 	void AddNewSInt16Data(const SInt16 *newData, const SInt64 numFrames, const SInt64 whichChannel);

diff --git a/Novocaine/RingBuffer.mm b/Novocaine/RingBuffer.mm
@@ -25,8 +25,6 @@
 #include "RingBuffer.h"
 
 
-// TODO: teardown function to release mData
-
 RingBuffer::RingBuffer(SInt64 bufferLength, SInt64 numChannels) : 
 mSizeOfBuffer(bufferLength)
 {
@@ -48,6 +46,13 @@
 
 }
 
+RingBuffer::~RingBuffer() 
+{
+    for (int i=0; i<mNumChannels; i++) {
+        free(mData[i]);
+    }
+}
+
 void RingBuffer::AddNewSInt16AudioBuffer(const AudioBuffer aBuffer)
 {