Core audio fun

Cog.xcodeproj/project.pbxproj

@@ -13,6 +13,10 @@
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		8E4C7F080A0509FC003BE25F /* DragScrollView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E4C7F060A0509FC003BE25F /* DragScrollView.h */; };
 		8E4C7F090A0509FC003BE25F /* DragScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E4C7F070A0509FC003BE25F /* DragScrollView.m */; };
+		8E6A8E2B0A0D8A68002ABE9C /* CoreAudioFile.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E6A8E270A0D8A68002ABE9C /* CoreAudioFile.h */; };
+		8E6A8E2C0A0D8A68002ABE9C /* CoreAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6A8E280A0D8A68002ABE9C /* CoreAudioFile.m */; };
+		8E6A8E370A0D8AD8002ABE9C /* CoreAudioUtils.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8E6A8E350A0D8AD8002ABE9C /* CoreAudioUtils.h */; };
+		8E6A8E380A0D8AD8002ABE9C /* CoreAudioUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6A8E360A0D8AD8002ABE9C /* CoreAudioUtils.m */; };
 		8E75756909F31D5A0080F1EE /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75751909F31D5A0080F1EE /* AppController.m */; };
 		8E75756A09F31D5A0080F1EE /* ClickField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75751C09F31D5A0080F1EE /* ClickField.m */; };
 		8E75756B09F31D5A0080F1EE /* InfoView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E75751E09F31D5A0080F1EE /* InfoView.m */; };
@@ -142,6 +146,8 @@
 				8E757B5809F326710080F1EE /* FAAD2.framework in CopyFiles */,
 				8E757B5909F326710080F1EE /* DecMPA.framework in CopyFiles */,
 				8E4C7F080A0509FC003BE25F /* DragScrollView.h in CopyFiles */,
+				8E6A8E2B0A0D8A68002ABE9C /* CoreAudioFile.h in CopyFiles */,
+				8E6A8E370A0D8AD8002ABE9C /* CoreAudioUtils.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -160,6 +166,10 @@
 		8D1107320486CEB800E47090 /* Cog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cog.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		8E4C7F060A0509FC003BE25F /* DragScrollView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DragScrollView.h; sourceTree = "<group>"; };
 		8E4C7F070A0509FC003BE25F /* DragScrollView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DragScrollView.m; sourceTree = "<group>"; };
+		8E6A8E270A0D8A68002ABE9C /* CoreAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CoreAudioFile.h; sourceTree = "<group>"; };
+		8E6A8E280A0D8A68002ABE9C /* CoreAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CoreAudioFile.m; sourceTree = "<group>"; };
+		8E6A8E350A0D8AD8002ABE9C /* CoreAudioUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CoreAudioUtils.h; sourceTree = "<group>"; };
+		8E6A8E360A0D8AD8002ABE9C /* CoreAudioUtils.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CoreAudioUtils.m; sourceTree = "<group>"; };
 		8E75751309F31D130080F1EE /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/MainMenu.nib; sourceTree = "<group>"; };
 		8E75751809F31D5A0080F1EE /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
 		8E75751909F31D5A0080F1EE /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = "<group>"; };
@@ -474,6 +484,8 @@
 		8E75754409F31D5A0080F1EE /* SoundFile */ = {
 			isa = PBXGroup;
 			children = (
+				8E6A8E270A0D8A68002ABE9C /* CoreAudioFile.h */,
+				8E6A8E280A0D8A68002ABE9C /* CoreAudioFile.m */,
 				8E75754509F31D5A0080F1EE /* AACFile.h */,
 				8E75754609F31D5A0080F1EE /* AACFile.m */,
 				8E75754709F31D5A0080F1EE /* FlacFile.h */,
@@ -512,6 +524,8 @@
 		8E75756209F31D5A0080F1EE /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				8E6A8E350A0D8AD8002ABE9C /* CoreAudioUtils.h */,
+				8E6A8E360A0D8AD8002ABE9C /* CoreAudioUtils.m */,
 				8E75756309F31D5A0080F1EE /* DBLog.h */,
 				8E75756409F31D5A0080F1EE /* DBLog.m */,
 				8E75756509F31D5A0080F1EE /* Semaphore.h */,
@@ -699,6 +713,8 @@
 				8E75758C09F31D5A0080F1EE /* Semaphore.m in Sources */,
 				8E75758D09F31D5A0080F1EE /* VirtualRingBuffer.m in Sources */,
 				8E4C7F090A0509FC003BE25F /* DragScrollView.m in Sources */,
+				8E6A8E2C0A0D8A68002ABE9C /* CoreAudioFile.m in Sources */,
+				8E6A8E380A0D8AD8002ABE9C /* CoreAudioUtils.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

English.lproj/MainMenu.nib/info.nib

@@ -28,11 +28,11 @@
 	<integer>3</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>513</integer>
-		<integer>823</integer>
 		<integer>463</integer>
-		<integer>29</integer>
+		<integer>823</integer>
 		<integer>21</integer>
+		<integer>29</integer>
+		<integer>513</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8I127</string>

Info.plist

@@ -95,7 +95,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.05 alpha 1</string>
+	<string>0.06</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>

Playlist/PlaylistController.m

@@ -10,6 +10,8 @@
 #import "PlaylistEntry.h"
 #import "Shuffle.h"
 
+extern NSArray * getCoreAudioExtensions();
+
 @implementation PlaylistController
 
 #define SHUFFLE_HISTORY_SIZE 100
@@ -20,7 +22,8 @@
 	
 	if (self)
 	{
-		acceptableFileTypes = [[NSArray alloc] initWithObjects:@"shn",@"wv",@"ogg",@"wav",@"mpc",@"flac",@"ape",@"mp3",@"aiff",@"aif",@"aac",nil];
+		acceptableFileTypes = [NSArray arrayWithObjects:@"shn",@"wv",@"ogg",@"mpc",@"flac",@"ape",nil];
+		acceptableFileTypes = [[acceptableFileTypes arrayByAddingObjectsFromArray:getCoreAudioExtensions()] retain];
 		acceptablePlaylistTypes = [[NSArray alloc] initWithObjects:@"playlist",nil];
 		shuffleList = [[NSMutableArray alloc] init];
 //		DBLog(@"DAH BUTTER CHORNAR: %@", history);
@@ -40,7 +43,7 @@
 	{
 		PlaylistEntry *pe = [[PlaylistEntry alloc] init];
 
-		[pe	setFilename:filename]; //Setfilename takes car of opening the soundfile..cheap hack, but works for now
+		[pe	setFilename:filename];
 		[pe setIndex:index];
 		[pe readTags];
 		[pe readInfo];

Playlist/PlaylistEntry.m

@@ -199,6 +199,7 @@
 	sampleRate = [sf frequency];
 	
 	[self setLengthString:length];
+	[sf release];
 //	DBLog(@"Length: %f bitRate: %i channels: %i bps: %i samplerate: %f", length, bitRate, channels, bitsPerSample, sampleRate);
 	
 	//[(SoundFile *)sf close];

Sound/BufferChain.m

@@ -67,6 +67,7 @@
 	[playlistEntry release];
 	
 	[inputNode release];
+	
 	[converterNode release];
 	
 	[super dealloc];

Sound/InputNode.m

@@ -40,7 +40,7 @@
 	char *buf;
 	int amountRead;
 	
-	DBLog(@"Playing file.\n");
+	NSLog(@"Playing file: %i", self);
 	buf = malloc(chunk_size);
 	
 	while ([self shouldContinue] == YES && [self endOfStream] == NO)
@@ -65,6 +65,8 @@
 	
 	free(buf);
 	[soundFile close];
+	
+	NSLog(@"CLOSED: %i", self);
 }
 
 - (void)seek:(double)time

Sound/SoundController.m

@@ -50,6 +50,7 @@
 	if (bufferChain)
 	{
 		[bufferChain setShouldContinue:NO];
+
 		[bufferChain release];
 	}
 	bufferChain = [[BufferChain alloc] initWithController:self];

Sound/SoundFile/CoreAudioFile.h

@@ -0,0 +1,32 @@
+/*
+ *  $Id$
+ *
+ *  Copyright (C) 2006 Stephen F. Booth <me@sbooth.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#import <Cocoa/Cocoa.h>
+
+#include <AudioToolbox/ExtendedAudioFile.h>
+
+#import "SoundFile.h"
+
+@interface CoreAudioFile : SoundFile
+{
+	ExtAudioFileRef			_in;
+}
+
+@end

Sound/SoundFile/CoreAudioFile.m

@@ -0,0 +1,192 @@
+/*
+ *  $Id$
+ *
+ *  Copyright (C) 2006 Stephen F. Booth <me@sbooth.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#import "CoreAudioFile.h"
+
+@interface CoreAudioFile (Private)
+- (BOOL) readInfoFromExtAudioFileRef:(ExtAudioFileRef)file;
+@end
+
+@implementation CoreAudioFile
+
+- (BOOL) open:(const char *)filename
+{
+	OSStatus		err;
+	FSRef			ref;
+	
+	// Open the input file
+	err = FSPathMakeRef((const UInt8 *)filename, &ref, NULL);
+	if(noErr != err) {
+		NSLog(@"Error opening ExtAudioFile: %i", err);
+		return NO;
+	}
+	
+	err = ExtAudioFileOpen(&ref, &_in);
+	if(noErr != err) {
+		NSLog(@"Error opening ExtAudioFile: %i", err);
+		return NO;
+	}
+	
+	// Read properties
+	return [self readInfoFromExtAudioFileRef:_in];
+}
+
+- (void) close
+{
+	OSStatus			err;
+	
+	err = ExtAudioFileDispose(_in);
+	if(noErr != err) {
+		NSLog(@"Error closing ExtAudioFile: %i", err);
+	}
+}
+
+- (BOOL) readInfo:(const char *)filename
+{
+	OSStatus						err;
+	FSRef							ref;
+	BOOL							result;
+	
+	result = YES;
+
+	// Open the input file
+	err = FSPathMakeRef((const UInt8 *)filename, &ref, NULL);
+	if(noErr != err) {
+		NSLog(@"Error closing ExtAudioFile: %i", err);
+		return NO;
+	}
+	
+	err = ExtAudioFileOpen(&ref, &_in);
+	if(noErr != err) {
+		NSLog(@"Error closing ExtAudioFile: %i", err);
+		return NO;
+	}
+	
+	result = [self readInfoFromExtAudioFileRef:_in];
+	
+	return result;
+}
+
+- (BOOL) readInfoFromExtAudioFileRef:(ExtAudioFileRef)file
+{
+	OSStatus						err;
+	UInt32							size;
+	SInt64							totalFrames;
+	AudioStreamBasicDescription		asbd;
+
+	// Get input file information
+	size	= sizeof(asbd);
+	err		= ExtAudioFileGetProperty(file, kExtAudioFileProperty_FileDataFormat, &size, &asbd);
+	if(err != noErr) {
+		err = ExtAudioFileDispose(file);
+		NSLog(@"Error closing ExtAudioFile: %i", err);
+		return NO;
+	}
+
+	size	= sizeof(totalFrames);
+	err		= ExtAudioFileGetProperty(file, kExtAudioFileProperty_FileLengthFrames, &size, &totalFrames);
+	if(err != noErr) {
+		err = ExtAudioFileDispose(file);
+		NSLog(@"Error closing ExtAudioFile: %i", err);
+		return NO;
+	}
+		
+	// Set our properties
+	bitsPerSample		= asbd.mBitsPerChannel;
+	channels			= asbd.mChannelsPerFrame;
+	frequency			= asbd.mSampleRate;
+	
+	// mBitsPerChannel will only be set for lpcm formats
+	if(0 == bitsPerSample) {
+		bitsPerSample = 16;
+	}
+	
+	totalSize			= totalFrames * channels * (bitsPerSample / 8);
+	currentPosition		= 0;
+	bitRate				= 0;
+
+	// Set output format
+	AudioStreamBasicDescription		result;
+	
+	bzero(&result, sizeof(AudioStreamBasicDescription));
+	
+	result.mFormatID			= kAudioFormatLinearPCM;
+	result.mFormatFlags			= kAudioFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsBigEndian;
+	
+	result.mSampleRate			= frequency;
+	result.mChannelsPerFrame	= channels;
+	result.mBitsPerChannel		= bitsPerSample;
+	
+	result.mBytesPerPacket		= channels * (bitsPerSample / 8);
+	result.mFramesPerPacket		= 1;
+	result.mBytesPerFrame		= channels * (bitsPerSample / 8);
+		
+	err = ExtAudioFileSetProperty(file, kExtAudioFileProperty_ClientDataFormat, sizeof(result), &result);
+	if(noErr != err) {
+		err = ExtAudioFileDispose(file);
+		NSLog(@"Error closing ExtAudioFile: %i", err);
+		return NO;
+	}
+	
+	// Further properties
+	isBigEndian			= YES;
+	isUnsigned			= NO;
+	
+	NSLog(@"Successfully read file");
+	
+	return YES;
+}
+
+- (int) fillBuffer:(void *)buf ofSize:(UInt32)size
+{
+	OSStatus				err;
+	AudioBufferList			bufferList;
+	UInt32					frameCount;
+	
+	// Set up the AudioBufferList
+	bufferList.mNumberBuffers				= 1;
+	bufferList.mBuffers[0].mNumberChannels	= channels;
+	bufferList.mBuffers[0].mData			= buf;
+	bufferList.mBuffers[0].mDataByteSize	= size;
+	
+	// Read a chunk of PCM input (converted from whatever format)
+	frameCount	= (size / (channels * (bitsPerSample / 8)));
+	err			= ExtAudioFileRead(_in, &frameCount, &bufferList);
+	if(err != noErr) {
+		NSLog(@"Error reading ExtAudioFile: %i", err);
+		return 0;
+	}	
+
+	return frameCount * (channels * (bitsPerSample / 8));
+}
+
+- (double) seekToTime:(double)milliseconds
+{
+	OSStatus			err;
+
+	err = ExtAudioFileSeek(_in, ((milliseconds / 1000.f) * frequency));
+	if(noErr != err) {
+		return -1.f;
+	}
+	
+	return milliseconds;	
+}
+
+@end

Sound/SoundFile/SoundFile.mm

@@ -9,14 +9,15 @@
 #import "SoundFile.h"
 
 #import "FlacFile.h"
-#import "AACFile.h"
+//#import "AACFile.h"
 #import "MonkeysFile.h"
-#import "MPEGFile.h"
+//#import "MPEGFile.h"
 #import "MusepackFile.h"
 #import "VorbisFile.h"
-#import "WaveFile.h"
+//#import "WaveFile.h"
 #import "WavPackFile.h"
 #import "ShnFile.h"
+#import "CoreAudioFile.h"
 
 extern "C" {
 BOOL hostIsBigEndian()
@@ -27,6 +28,9 @@ BOOL hostIsBigEndian()
 	return NO;
 #endif
 }
+
+extern NSArray * getCoreAudioExtensions();
+
 };
 
 @implementation SoundFile
@@ -75,14 +79,17 @@ BOOL hostIsBigEndian()
 */
 + (SoundFile *)soundFileFromFilename:(NSString *)filename
 {
-	SoundFile *soundFile;
+	SoundFile	*soundFile;
+	NSString	*extension;
 	DBLog(@"Filename: %@", filename);
 	
-	if (([[filename pathExtension] caseInsensitiveCompare:@"wav"] == NSOrderedSame) || ([[filename pathExtension] caseInsensitiveCompare:@"aiff"] == NSOrderedSame) || ([[filename pathExtension] caseInsensitiveCompare:@"aif"] == NSOrderedSame))
+	extension = [filename pathExtension];
+	
+	/*if (([[filename pathExtension] caseInsensitiveCompare:@"wav"] == NSOrderedSame) || ([[filename pathExtension] caseInsensitiveCompare:@"aiff"] == NSOrderedSame) || ([[filename pathExtension] caseInsensitiveCompare:@"aif"] == NSOrderedSame))
 	{
 		soundFile = [[WaveFile alloc] init];
-	}
+	}*/
-	else if ([[filename pathExtension] caseInsensitiveCompare:@"ogg"] == NSOrderedSame)
+	if ([[filename pathExtension] caseInsensitiveCompare:@"ogg"] == NSOrderedSame)
 	{
 		soundFile = [[VorbisFile alloc] init];
 	}
@@ -98,14 +105,14 @@ BOOL hostIsBigEndian()
 	{
 		soundFile = [[MonkeysFile alloc] init];
 	}
-	else if ([[filename pathExtension] caseInsensitiveCompare:@"mp3"] == NSOrderedSame)
+	/*else if ([[filename pathExtension] caseInsensitiveCompare:@"mp3"] == NSOrderedSame)
 	{
 		soundFile = [[MPEGFile alloc] init];
 	}
 	else if ([[filename pathExtension] caseInsensitiveCompare:@"aac"] == NSOrderedSame)
 	{
 		soundFile = [[AACFile alloc] init];
-	}
+	}*/
 	else if ([[filename pathExtension] caseInsensitiveCompare:@"wv"] == NSOrderedSame)
 	{
 		soundFile = [[WavPackFile alloc] init];
@@ -116,7 +123,17 @@ BOOL hostIsBigEndian()
 	}
 	else
 	{
+		unsigned i;
+		NSArray *extensions = getCoreAudioExtensions();
+		
 		soundFile = nil;
+
+		for(i = 0; i < [extensions count]; ++i) {
+			if([[extensions objectAtIndex:i] caseInsensitiveCompare:extension]) {
+				soundFile = [[CoreAudioFile alloc] init];
+				break;
+			}
+		}
 	}
 	
 	return soundFile;

Utils/CoreAudioUtils.h

@@ -0,0 +1,24 @@
+/*
+ *  $Id$
+ *
+ *  Copyright (C) 2006 Stephen F. Booth <me@sbooth.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#import <Cocoa/Cocoa.h>
+
+// Return an array of valid audio file extensions recognized by Core Audio
+NSArray *	getCoreAudioExtensions();

Utils/CoreAudioUtils.m

@@ -0,0 +1,49 @@
+/*
+ *  $Id$
+ *
+ *  Copyright (C) 2006 Stephen F. Booth <me@sbooth.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "CoreAudioUtils.h"
+
+#include <AudioToolbox/AudioFile.h>
+
+// CoreAudio utility function
+static NSArray *sAudioExtensions		= nil;
+
+// Return an array of valid audio file extensions recognized by Core Audio
+NSArray *
+getCoreAudioExtensions()
+{
+	OSStatus			err;
+	UInt32				size;
+	
+	@synchronized(sAudioExtensions) {
+		if(nil == sAudioExtensions) {
+			size	= sizeof(sAudioExtensions);
+			err		= AudioFileGetGlobalInfo(kAudioFileGlobalInfo_AllExtensions, 0, NULL, &size, &sAudioExtensions);
+			if(noErr != err) {
+				return nil;
+			}
+			
+			[sAudioExtensions retain];
+		}
+	}
+	
+	return sAudioExtensions;
+}
+