From 63ea4cf7e340782dcfb638071bad7050c2daa5b1 Mon Sep 17 00:00:00 2001 From: Matej Jan Date: Fri, 12 Oct 2012 18:24:05 +0000 Subject: [PATCH] Fixed garbage creation in AudioContent. git-svn-id: http://xni.googlecode.com/svn/XNI@121 ac433895-eea3-a490-d80a-17149a75e588 --- .../Content/Pipeline/Audio/AudioContent.h | 1 - .../Content/Pipeline/Audio/AudioContent.m | 14 ++++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Classes/Retronator/Xni/Framework/Content/Pipeline/Audio/AudioContent.h b/Classes/Retronator/Xni/Framework/Content/Pipeline/Audio/AudioContent.h index 5f5243f..aefd1d0 100644 --- a/Classes/Retronator/Xni/Framework/Content/Pipeline/Audio/AudioContent.h +++ b/Classes/Retronator/Xni/Framework/Content/Pipeline/Audio/AudioContent.h @@ -21,7 +21,6 @@ int loopStart; @private - NSURL *fileUrl; ExtAudioFileRef extRef; } diff --git a/Classes/Retronator/Xni/Framework/Content/Pipeline/Audio/AudioContent.m b/Classes/Retronator/Xni/Framework/Content/Pipeline/Audio/AudioContent.m index 3e39223..fa335fc 100644 --- a/Classes/Retronator/Xni/Framework/Content/Pipeline/Audio/AudioContent.m +++ b/Classes/Retronator/Xni/Framework/Content/Pipeline/Audio/AudioContent.m @@ -16,7 +16,7 @@ { self = [super init]; if (self != nil) { - fileName = theFileName; + fileName = [theFileName retain]; fileType = theFileType; // Load file. @@ -25,10 +25,12 @@ UInt32 thePropertySize = sizeof(theFileFormat); // Open a file with ExtAudioFileOpen(). - fileUrl = [[NSURL fileURLWithPath:theFileName] retain]; - extRef = nil; + NSURL *fileUrl = [NSURL fileURLWithPath:theFileName]; + + extRef = nil; err = ExtAudioFileOpenURL((CFURLRef)fileUrl, &extRef); - if (err) { + + if (err) { [NSException raise:@"NotSupportedException" format:@"ExtAudioFileOpenURL FAILED, Error = %ld\n", err]; } @@ -111,9 +113,9 @@ - (void) dealloc { - //if (extRef) ExtAudioFileDispose(extRef); + if (extRef) ExtAudioFileDispose(extRef); [format release]; - [fileUrl release]; + [fileName release]; [super dealloc]; }