fixed homepage

EZAudio.podspec

@@ -1,27 +1,17 @@
 Pod::Spec.new do |s|
-    s.name         = "EZAudio"
-    s.version      = "0.9.1"
-    s.summary      = "A simple, intuitive audio framework for iOS and OSX useful for anyone doing audio processing and/or audio-based visualizations."
-    s.homepage     = "https://github.com/syedhali/EZAudio"
-    s.screenshots  = "https://s3-us-west-1.amazonaws.com/ezaudio-media/EZAudioSummary.png"
-    s.license      = { :type => 'MIT', :file => 'LICENSE' }
-    s.author       = { "Syed Haris Ali" => "syedhali07@gmail.com" }
-    s.ios.deployment_target = '6.0'
-    s.osx.deployment_target = '10.8'
-    s.source       = { :git => "https://github.com/syedhali/EZAudio.git", :tag => s.version }
-    s.exclude_files = [ 'EZAudio/VERSION', 'EZAudio/TPCircularBuffer.{h,c}' ]
-    s.ios.frameworks = 'AudioToolbox','AVFoundation','GLKit'
-    s.osx.frameworks = 'AudioToolbox','AudioUnit','CoreAudio','QuartzCore','OpenGL','GLKit'
-    s.requires_arc = true;
-    s.default_subspec = 'Full'
-
-    s.subspec 'Core' do |core|
-        core.source_files  = 'EZAudio/*.{h,m,c}'
-    end
-    
-    s.subspec 'Full' do |full|
-        full.dependency 'TPCircularBuffer', '~> 0.0'
-        full.dependency 'EZAudio/Core'
-    end
-
+  s.name         = "EZAudio"
+  s.version      = "0.1.0"
+  s.summary      = "A simple, intuitive audio framework for iOS and OSX useful for anyone doing audio processing and/or audio-based visualizations."
+  s.homepage     = "https://github.com/syedhali/EZAudio"
+  s.screenshots  = "https://s3-us-west-1.amazonaws.com/ezaudio-media/EZAudioSummary.png"
+  s.license      = { :type => 'MIT', :file => 'LICENSE' }
+  s.author       = { "Syed Haris Ali" => "syedhali07@gmail.com" }
+  s.ios.deployment_target = '6.0'
+  s.osx.deployment_target = '10.8'
+  s.source       = { :git => "https://github.com/syedhali/EZAudio.git", :tag => s.version }
+  s.source_files  = 'EZAudio/*.{h,m,c}'
+  s.exclude_files = 'EZAudio/VERSION'
+  s.ios.frameworks = 'AudioToolbox','AVFoundation','GLKit'
+  s.osx.frameworks = 'AudioToolbox','AudioUnit','CoreAudio','QuartzCore','OpenGL','GLKit'
+  s.requires_arc = true;
 end

EZAudio/AEFloatConverter.h

@@ -0,0 +1,124 @@
+//
+//  AEFloatConverter.h
+//  The Amazing Audio Engine
+//
+//  Created by Michael Tyson on 25/10/2012.
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty.  In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//     claim that you wrote the original software. If you use this software
+//     in a product, an acknowledgment in the product documentation would be
+//     appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//     misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source distribution.
+//
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#import <Foundation/Foundation.h>
+#import <AudioToolbox/AudioToolbox.h>
+
+/*!
+ * Universal converter to float format
+ *
+ *  Use this class to easily convert arbitrary audio formats to floating point
+ *  for use with utilities like the Accelerate framework.
+ */
+@interface AEFloatConverter : NSObject
+
+/*!
+ * Initialize
+ *
+ * @param sourceFormat The audio format to use
+ */
+- (id)initWithSourceFormat:(AudioStreamBasicDescription)sourceFormat;
+
+/*!
+ * Convert audio to floating-point
+ *
+ *  This C function, safe to use in a Core Audio realtime thread context, will take
+ *  an audio buffer list of audio in the format you provided at initialisation, and
+ *  convert it into a noninterleaved float array.
+ *
+ * @param converter         Pointer to the converter object.
+ * @param sourceBuffer      An audio buffer list containing the source audio.
+ * @param targetBuffers     An array of floating-point arrays to store the converted float audio into. 
+ *                          Note that you must provide the correct number of arrays, to match the number of channels.
+ * @param frames            The number of frames to convert.
+ * @return YES on success; NO on failure
+ */
+BOOL AEFloatConverterToFloat(AEFloatConverter* converter, AudioBufferList *sourceBuffer, float * const * targetBuffers, UInt32 frames);
+
+/*!
+ * Convert audio to floating-point, in a buffer list
+ *
+ *  This C function, safe to use in a Core Audio realtime thread context, will take
+ *  an audio buffer list of audio in the format you provided at initialisation, and
+ *  convert it into a noninterleaved float format.
+ *
+ * @param converter         Pointer to the converter object.
+ * @param sourceBuffer      An audio buffer list containing the source audio.
+ * @param targetBuffer      An audio buffer list to store the converted floating-point audio.
+ * @param frames            The number of frames to convert.
+ * @return YES on success; NO on failure
+ */
+BOOL AEFloatConverterToFloatBufferList(AEFloatConverter* converter, AudioBufferList *sourceBuffer,  AudioBufferList *targetBuffer, UInt32 frames);
+
+/*!
+ * Convert audio from floating-point
+ *
+ *  This C function, safe to use in a Core Audio realtime thread context, will take
+ *  an audio buffer list of audio in the format you provided at initialisation, and
+ *  convert it into a float array.
+ *
+ * @param converter         Pointer to the converter object.
+ * @param sourceBuffers     An array of floating-point arrays containing the floating-point audio to convert.
+ *                          Note that you must provide the correct number of arrays, to match the number of channels.
+ * @param targetBuffer      An audio buffer list to store the converted audio into.
+ * @param frames            The number of frames to convert.
+ * @return YES on success; NO on failure
+ */
+BOOL AEFloatConverterFromFloat(AEFloatConverter* converter, float * const * sourceBuffers, AudioBufferList *targetBuffer, UInt32 frames);
+
+/*!
+ * Convert audio from floating-point, in a buffer list
+ *
+ *  This C function, safe to use in a Core Audio realtime thread context, will take
+ *  an audio buffer list of audio in the format you provided at initialisation, and
+ *  convert it into a float array.
+ *
+ * @param converter         Pointer to the converter object.
+ * @param sourceBuffer      An audio buffer list containing the source audio.
+ * @param targetBuffer      An audio buffer list to store the converted audio into.
+ * @param frames            The number of frames to convert.
+ * @return YES on success; NO on failure
+ */
+BOOL AEFloatConverterFromFloatBufferList(AEFloatConverter* converter, AudioBufferList *sourceBuffer, AudioBufferList *targetBuffer, UInt32 frames);
+
+/*!
+ * The AudioStreamBasicDescription representing the converted floating-point format
+ */
+@property (nonatomic, readonly) AudioStreamBasicDescription floatingPointAudioDescription;
+
+/*!
+ * The source audio format set at initialization
+ */
+@property (nonatomic, readonly) AudioStreamBasicDescription sourceFormat;
+
+@end
+
+#ifdef __cplusplus
+}
+#endif

EZAudio/AEFloatConverter.m

@@ -0,0 +1,211 @@
+//
+//  AEFloatConverter.m
+//  The Amazing Audio Engine
+//
+//  Created by Michael Tyson on 25/10/2012.
+//
+//  This software is provided 'as-is', without any express or implied
+//  warranty.  In no event will the authors be held liable for any damages
+//  arising from the use of this software.
+//
+//  Permission is granted to anyone to use this software for any purpose,
+//  including commercial applications, and to alter it and redistribute it
+//  freely, subject to the following restrictions:
+//
+//  1. The origin of this software must not be misrepresented; you must not
+//     claim that you wrote the original software. If you use this software
+//     in a product, an acknowledgment in the product documentation would be
+//     appreciated but is not required.
+//
+//  2. Altered source versions must be plainly marked as such, and must not be
+//     misrepresented as being the original software.
+//
+//  3. This notice may not be removed or altered from any source distribution.
+//
+
+#import "AEFloatConverter.h"
+
+#define checkResult(result,operation) (_checkResult((result),(operation),strrchr(__FILE__, '/')+1,__LINE__))
+static inline BOOL _checkResult(OSStatus result, const char *operation, const char* file, int line) {
+    if (result != noErr) {
+        NSLog(@"%s:%d: %s result %d %08X %4.4s", file, line, operation, (int)result, (int)result, (char*)&result);
+        return NO;
+    }
+    return YES;
+}
+
+#define                        kNoMoreDataErr                            -2222
+
+struct complexInputDataProc_t {
+    AudioBufferList *sourceBuffer;
+};
+
+@interface AEFloatConverter () {
+    AudioStreamBasicDescription _sourceAudioDescription;
+    AudioStreamBasicDescription _floatAudioDescription;
+    AudioConverterRef           _toFloatConverter;
+    AudioConverterRef           _fromFloatConverter;
+    AudioBufferList            *_scratchFloatBufferList;
+}
+
+static OSStatus complexInputDataProc(AudioConverterRef             inAudioConverter,
+                                     UInt32                        *ioNumberDataPackets,
+                                     AudioBufferList               *ioData,
+                                     AudioStreamPacketDescription  **outDataPacketDescription,
+                                     void                          *inUserData);
+@end
+
+@implementation AEFloatConverter
+@synthesize sourceFormat = _sourceAudioDescription;
+
+-(id)initWithSourceFormat:(AudioStreamBasicDescription)sourceFormat {
+    if (!(self = [super init])) return nil;
+
+    _floatAudioDescription.mFormatID          = kAudioFormatLinearPCM;
+    _floatAudioDescription.mFormatFlags       = kAudioFormatFlagIsFloat | kAudioFormatFlagIsPacked | kAudioFormatFlagIsNonInterleaved;
+    _floatAudioDescription.mChannelsPerFrame  = sourceFormat.mChannelsPerFrame;
+    _floatAudioDescription.mBytesPerPacket    = sizeof(float);
+    _floatAudioDescription.mFramesPerPacket   = 1;
+    _floatAudioDescription.mBytesPerFrame     = sizeof(float);
+    _floatAudioDescription.mBitsPerChannel    = 8 * sizeof(float);
+    _floatAudioDescription.mSampleRate        = sourceFormat.mSampleRate;
+    
+    _sourceAudioDescription = sourceFormat;
+    
+    if (memcmp(&sourceFormat, &_floatAudioDescription, sizeof(AudioStreamBasicDescription)) != 0) {
+        checkResult(AudioConverterNew(&sourceFormat, &_floatAudioDescription, &_toFloatConverter), "AudioConverterNew");
+        checkResult(AudioConverterNew(&_floatAudioDescription, &sourceFormat, &_fromFloatConverter), "AudioConverterNew");
+        _scratchFloatBufferList = (AudioBufferList*)malloc(sizeof(AudioBufferList) + (_floatAudioDescription.mChannelsPerFrame-1)*sizeof(AudioBuffer));
+        _scratchFloatBufferList->mNumberBuffers = _floatAudioDescription.mChannelsPerFrame;
+        for ( int i=0; i<_scratchFloatBufferList->mNumberBuffers; i++) {
+            _scratchFloatBufferList->mBuffers[i].mNumberChannels = 1;
+        }
+    }
+    
+    return self;
+}
+
+-(void)dealloc {
+    if (_toFloatConverter) AudioConverterDispose(_toFloatConverter);
+    if (_fromFloatConverter) AudioConverterDispose(_fromFloatConverter);
+    if (_scratchFloatBufferList) free(_scratchFloatBufferList);
+//    [super dealloc];
+}
+
+
+BOOL AEFloatConverterToFloat(AEFloatConverter* THIS, AudioBufferList *sourceBuffer, float * const * targetBuffers, UInt32 frames) {
+    if (frames == 0) return YES;
+    
+    if (THIS->_toFloatConverter) {
+        UInt32 priorDataByteSize = sourceBuffer->mBuffers[0].mDataByteSize;
+        for ( int i=0; i<sourceBuffer->mNumberBuffers; i++) {
+            sourceBuffer->mBuffers[i].mDataByteSize = frames * THIS->_sourceAudioDescription.mBytesPerFrame;
+        }
+        
+        for ( int i=0; i<THIS->_scratchFloatBufferList->mNumberBuffers; i++) {
+            THIS->_scratchFloatBufferList->mBuffers[i].mData = targetBuffers[i];
+            THIS->_scratchFloatBufferList->mBuffers[i].mDataByteSize = frames * sizeof(float);
+        }
+      
+        OSStatus result = AudioConverterFillComplexBuffer(THIS->_toFloatConverter,
+                                                          complexInputDataProc,
+                                                          &(struct complexInputDataProc_t) { .sourceBuffer = sourceBuffer },
+                                                          &frames,
+                                                          THIS->_scratchFloatBufferList,
+                                                          NULL);
+        
+        for ( int i=0; i<sourceBuffer->mNumberBuffers; i++) {
+            sourceBuffer->mBuffers[i].mDataByteSize = priorDataByteSize;
+        }
+        
+        if (!checkResult(result, "AudioConverterConvertComplexBuffer")) {
+            return NO;
+        }
+        
+    } else {
+        for ( int i=0; i<sourceBuffer->mNumberBuffers; i++) {
+            memcpy(targetBuffers[i], sourceBuffer->mBuffers[i].mData, frames * sizeof(float));
+        }
+    }
+    
+    return YES;
+}
+
+BOOL AEFloatConverterToFloatBufferList(AEFloatConverter* converter, AudioBufferList *sourceBuffer,  AudioBufferList *targetBuffer, UInt32 frames) {
+    assert(targetBuffer->mNumberBuffers == converter->_floatAudioDescription.mChannelsPerFrame);
+    
+    float *targetBuffers[targetBuffer->mNumberBuffers];
+    for ( int i=0; i<targetBuffer->mNumberBuffers; i++) {
+        targetBuffers[i] = (float*)targetBuffer->mBuffers[i].mData;
+    }
+    return AEFloatConverterToFloat(converter, sourceBuffer, targetBuffers, frames);
+}
+
+BOOL AEFloatConverterFromFloat(AEFloatConverter* THIS, float * const * sourceBuffers, AudioBufferList *targetBuffer, UInt32 frames) {
+    if (frames == 0) return YES;
+    
+    if (THIS->_fromFloatConverter) {
+        for ( int i=0; i<THIS->_scratchFloatBufferList->mNumberBuffers; i++) {
+            THIS->_scratchFloatBufferList->mBuffers[i].mData = sourceBuffers[i];
+            THIS->_scratchFloatBufferList->mBuffers[i].mDataByteSize = frames * sizeof(float);
+        }
+        
+        UInt32 priorDataByteSize = targetBuffer->mBuffers[0].mDataByteSize;
+        for ( int i=0; i<targetBuffer->mNumberBuffers; i++) {
+            targetBuffer->mBuffers[i].mDataByteSize = frames * THIS->_sourceAudioDescription.mBytesPerFrame;
+        }
+        
+        OSStatus result = AudioConverterFillComplexBuffer(THIS->_fromFloatConverter,
+                                                          complexInputDataProc,
+                                                          &(struct complexInputDataProc_t) { .sourceBuffer = THIS->_scratchFloatBufferList },
+                                                          &frames,
+                                                          targetBuffer,
+                                                          NULL);
+        
+        for ( int i=0; i<targetBuffer->mNumberBuffers; i++) {
+            targetBuffer->mBuffers[i].mDataByteSize = priorDataByteSize;
+        }
+        
+        if (!checkResult(result, "AudioConverterConvertComplexBuffer")) {
+            return NO;
+        }
+    } else {
+        for ( int i=0; i<targetBuffer->mNumberBuffers; i++) {
+            memcpy(targetBuffer->mBuffers[i].mData, sourceBuffers[i], frames * sizeof(float));
+        }
+    }
+    
+    return YES;
+}
+
+BOOL AEFloatConverterFromFloatBufferList(AEFloatConverter* converter, AudioBufferList *sourceBuffer, AudioBufferList *targetBuffer, UInt32 frames) {
+    assert(sourceBuffer->mNumberBuffers == converter->_floatAudioDescription.mChannelsPerFrame);
+    
+    float *sourceBuffers[sourceBuffer->mNumberBuffers];
+    for ( int i=0; i<sourceBuffer->mNumberBuffers; i++) {
+        sourceBuffers[i] = (float*)sourceBuffer->mBuffers[i].mData;
+    }
+    return AEFloatConverterFromFloat(converter, sourceBuffers, targetBuffer, frames);
+}
+
+static OSStatus complexInputDataProc(AudioConverterRef             inAudioConverter,
+                                     UInt32                        *ioNumberDataPackets,
+                                     AudioBufferList               *ioData,
+                                     AudioStreamPacketDescription  **outDataPacketDescription,
+                                     void                          *inUserData) {
+    struct complexInputDataProc_t *arg = (struct complexInputDataProc_t*)inUserData;
+    if (!arg->sourceBuffer) {
+        return kNoMoreDataErr;
+    }
+    
+    memcpy(ioData, arg->sourceBuffer, sizeof(AudioBufferList) + (arg->sourceBuffer->mNumberBuffers-1)*sizeof(AudioBuffer));
+    arg->sourceBuffer = NULL;
+    
+    return noErr;
+}
+
+-(AudioStreamBasicDescription)floatingPointAudioDescription {
+    return _floatAudioDescription;
+}
+
+@end

EZAudio/EZAudio.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 11/21/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -25,33 +25,25 @@
 
 #import <Foundation/Foundation.h>
 
-//------------------------------------------------------------------------------
-#pragma mark - Core Components
-//------------------------------------------------------------------------------
+#pragma mark - 3rd Party Utilties
+#import "TPCircularBuffer.h"
 
-#import "EZAudioDevice.h"
+#pragma mark - Core Components
 #import "EZAudioFile.h"
+#import "EZAudioFloatData.h"
 #import "EZMicrophone.h"
 #import "EZOutput.h"
 #import "EZRecorder.h"
+#import "EZAudioUtilities.h"
+
+#pragma mark - Extended Components
 #import "EZAudioPlayer.h"
 
-//------------------------------------------------------------------------------
 #pragma mark - Interface Components
-//------------------------------------------------------------------------------
-
 #import "EZPlot.h"
-#import "EZAudioDisplayLink.h"
 #import "EZAudioPlot.h"
 #import "EZAudioPlotGL.h"
-
-//------------------------------------------------------------------------------
-#pragma mark - Utility Components
-//------------------------------------------------------------------------------
-
-#import "EZAudioFloatConverter.h"
-#import "EZAudioFloatData.h"
-#import "EZAudioUtilities.h"
+#import "EZAudioPlotGLKViewController.h"
 
 //------------------------------------------------------------------------------
 

EZAudio/EZAudioDevice.h

@@ -27,37 +27,20 @@
 // @name Getting The Devices
 //------------------------------------------------------------------------------
 
-/**
- Provides the current EZAudioDevice that is being used to pull input.
- @return An EZAudioDevice instance representing the currently selected input device.
- */
-+ (EZAudioDevice *)currentInputDevice;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the current EZAudioDevice that is being used to output audio.
- @return An EZAudioDevice instance representing the currently selected ouotput device.
- */
-+ (EZAudioDevice *)currentOutputDevice;
-
-//------------------------------------------------------------------------------
-
 /**
  Enumerates all the available input devices and returns the result in an NSArray of EZAudioDevice instances.
  @return An NSArray containing EZAudioDevice instances, one for each available input device.
  */
 + (NSArray *)inputDevices;
 
-//------------------------------------------------------------------------------
+#if TARGET_OS_IPHONE
 
 /**
- Enumerates all the available output devices and returns the result in an NSArray of EZAudioDevice instances.
- @return An NSArray of output EZAudioDevice instances.
+ Provides the current EZAudioDevice that is being used to pull input.
+    - iOS only
+ @return An EZAudioDevice instance representing the currently selected input device.
  */
-+ (NSArray *)outputDevices;
-
-#if TARGET_OS_IPHONE
++ (EZAudioDevice *)currentInputDevice;
 
 //------------------------------------------------------------------------------
 
@@ -69,16 +52,6 @@
 + (void)enumerateInputDevicesUsingBlock:(void(^)(EZAudioDevice *device,
                                                  BOOL *stop))block;
 
-//------------------------------------------------------------------------------
-
-/**
- Enumerates all the available output devices.
- - iOS only
- @param block When enumerating this block executes repeatedly for each EZAudioDevice found. It contains two arguments - first, the EZAudioDevice found, then a pointer to a stop BOOL to allow breaking out of the enumeration)
- */
-+ (void)enumerateOutputDevicesUsingBlock:(void (^)(EZAudioDevice *device,
-                                                   BOOL *stop))block;
-
 #elif TARGET_OS_MAC
 
 /**
@@ -90,6 +63,15 @@
 
 //------------------------------------------------------------------------------
 
+/**
+ Enumerates all the available output devices and returns the result in an NSArray of EZAudioDevice instances.
+    - OSX only
+ @return An NSArray of output EZAudioDevice instances.
+ */
++ (NSArray *)outputDevices;
+
+//------------------------------------------------------------------------------
+
 /**
  Enumerates all the available devices. 
     - OSX only

EZAudio/EZAudioDevice.m

@@ -49,19 +49,6 @@
 
 //------------------------------------------------------------------------------
 
-+ (EZAudioDevice *)currentOutputDevice
-{
-    AVAudioSession *session = [AVAudioSession sharedInstance];
-    AVAudioSessionPortDescription *port = [[[session currentRoute] outputs] firstObject];
-    AVAudioSessionDataSourceDescription *dataSource = [session outputDataSource];
-    EZAudioDevice *device = [[EZAudioDevice alloc] init];
-    device.port = port;
-    device.dataSource = dataSource;
-    return device;
-}
-
-//------------------------------------------------------------------------------
-
 + (NSArray *)inputDevices
 {
     __block NSMutableArray *devices = [NSMutableArray array];
@@ -74,18 +61,6 @@
 
 //------------------------------------------------------------------------------
 
-+ (NSArray *)outputDevices
-{
-    __block NSMutableArray *devices = [NSMutableArray array];
-    [self enumerateOutputDevicesUsingBlock:^(EZAudioDevice *device, BOOL *stop)
-     {
-         [devices addObject:device];
-     }];
-    return devices;
-}
-
-//------------------------------------------------------------------------------
-
 + (void)enumerateInputDevicesUsingBlock:(void (^)(EZAudioDevice *, BOOL *))block
 {
     if (!block)
@@ -126,42 +101,6 @@
 
 //------------------------------------------------------------------------------
 
-+ (void)enumerateOutputDevicesUsingBlock:(void (^)(EZAudioDevice *, BOOL *))block
-{
-    if (!block)
-    {
-        return;
-    }
-    
-    AVAudioSessionRouteDescription *currentRoute = [[AVAudioSession sharedInstance] currentRoute];
-    NSArray *portDescriptions = [currentRoute outputs];
-    
-    BOOL stop;
-    for (AVAudioSessionPortDescription *outputDevicePortDescription in portDescriptions)
-    {
-        // add any additional sub-devices
-        NSArray *dataSources = [outputDevicePortDescription dataSources];
-        if (dataSources.count)
-        {
-            for (AVAudioSessionDataSourceDescription *outputDeviceDataSourceDescription in dataSources)
-            {
-                EZAudioDevice *device = [[EZAudioDevice alloc] init];
-                device.port = outputDevicePortDescription;
-                device.dataSource = outputDeviceDataSourceDescription;
-                block(device, &stop);
-            }
-        }
-        else
-        {
-            EZAudioDevice *device = [[EZAudioDevice alloc] init];
-            device.port = outputDevicePortDescription;
-            block(device, &stop);
-        }
-    }
-}
-
-//------------------------------------------------------------------------------
-
 - (NSString *)name
 {
     NSMutableString *name = [NSMutableString string];
@@ -217,11 +156,11 @@
     AudioObjectPropertyAddress address = [self addressForPropertySelector:kAudioHardwarePropertyDevices];
     UInt32 devicesDataSize;
     [EZAudioUtilities checkResult:AudioObjectGetPropertyDataSize(kAudioObjectSystemObject,
-                                                                 &address,
-                                                                 0,
-                                                                 NULL,
-                                                                 &devicesDataSize)
-                        operation:"Failed to get data size"];
+                                                     &address,
+                                                     0,
+                                                     NULL,
+                                                     &devicesDataSize)
+            operation:"Failed to get data size"];
     
     // enumerate devices
     NSInteger count = devicesDataSize / sizeof(AudioDeviceID);
@@ -271,44 +210,6 @@
 
 //------------------------------------------------------------------------------
 
-+ (EZAudioDevice *)deviceWithPropertySelector:(AudioObjectPropertySelector)propertySelector
-{
-    AudioDeviceID deviceID;
-    UInt32 propSize = sizeof(AudioDeviceID);
-    AudioObjectPropertyAddress address = [self addressForPropertySelector:propertySelector];
-    [EZAudioUtilities checkResult:AudioObjectGetPropertyData(kAudioObjectSystemObject,
-                                                             &address,
-                                                             0,
-                                                             NULL,
-                                                             &propSize,
-                                                             &deviceID)
-                        operation:"Failed to get device device on OSX"];
-    EZAudioDevice *device = [[EZAudioDevice alloc] init];
-    device.deviceID = deviceID;
-    device.manufacturer = [self manufacturerForDeviceID:deviceID];
-    device.name = [self namePropertyForDeviceID:deviceID];
-    device.UID = [self UIDPropertyForDeviceID:deviceID];
-    device.inputChannelCount = [self channelCountForScope:kAudioObjectPropertyScopeInput forDeviceID:deviceID];
-    device.outputChannelCount = [self channelCountForScope:kAudioObjectPropertyScopeOutput forDeviceID:deviceID];
-    return device;
-}
-
-//------------------------------------------------------------------------------
-
-+ (EZAudioDevice *)currentInputDevice
-{
-    return [self deviceWithPropertySelector:kAudioHardwarePropertyDefaultInputDevice];
-}
-
-//------------------------------------------------------------------------------
-
-+ (EZAudioDevice *)currentOutputDevice
-{
-    return [self deviceWithPropertySelector:kAudioHardwarePropertyDefaultOutputDevice];
-}
-
-//------------------------------------------------------------------------------
-
 + (NSArray *)inputDevices
 {
     __block NSMutableArray *devices = [NSMutableArray array];

EZAudio/EZAudioDisplayLink.h

@@ -1,94 +0,0 @@
-//
-//  EZAudioDisplayLink.h
-//  EZAudio
-//
-//  Created by Syed Haris Ali on 6/25/15.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import <QuartzCore/QuartzCore.h>
-
-@class EZAudioDisplayLink;
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioDisplayLinkDelegate
-//------------------------------------------------------------------------------
-
-/**
- The EZAudioDisplayLinkDelegate provides a means for an EZAudioDisplayLink instance to notify a receiver when it should redraw itself.
- */
-@protocol EZAudioDisplayLinkDelegate <NSObject>
-
-@required
-/**
- Required method for an EZAudioDisplayLinkDelegate to implement. This fires at the screen's display rate (typically 60 fps).
- @param displayLink An EZAudioDisplayLink instance used by a receiver to draw itself at the screen's refresh rate.
- */
-- (void)displayLinkNeedsDisplay:(EZAudioDisplayLink *)displayLink;
-
-@end
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioDisplayLink
-//------------------------------------------------------------------------------
-
-/**
- The EZAudioDisplayLink provides a cross-platform (iOS and Mac) abstraction over the CADisplayLink for iOS and CVDisplayLink for Mac. The purpose of this class is to provide an accurate timer for views that need to redraw themselves at 60 fps. This class is used by the EZAudioPlot and, eventually, the EZAudioPlotGL to provide a timer mechanism to draw real-time plots.
- */
-@interface EZAudioDisplayLink : NSObject
-
-//------------------------------------------------------------------------------
-#pragma mark - Class Methods
-//------------------------------------------------------------------------------
-
-/**
- Class method to create an EZAudioDisplayLink. The caller should implement the EZAudioDisplayLinkDelegate protocol to receive the `displayLinkNeedsDisplay:` delegate method to know when to redraw itself.
- @param delegate An instance that implements the EZAudioDisplayLinkDelegate protocol.
- @return An instance of the EZAudioDisplayLink.
- */
-+ (instancetype)displayLinkWithDelegate:(id<EZAudioDisplayLinkDelegate>)delegate;
-
-//------------------------------------------------------------------------------
-#pragma mark - Properties
-//------------------------------------------------------------------------------
-
-/**
- The EZAudioDisplayLinkDelegate for which to receive the redraw calls.
- */
-@property (nonatomic, weak) id<EZAudioDisplayLinkDelegate> delegate;
-
-//------------------------------------------------------------------------------
-#pragma mark - Instance Methods
-//------------------------------------------------------------------------------
-
-/**
- Method to start the display link and provide the `displayLinkNeedsDisplay:` calls to the `delegate`
- */
-- (void)start;
-
-/**
- Method to stop the display link from providing the `displayLinkNeedsDisplay:` calls to the `delegate`
- */
-- (void)stop;
-
-//------------------------------------------------------------------------------
-
-@end

EZAudio/EZAudioDisplayLink.m

@@ -1,180 +0,0 @@
-//
-//  EZAudioDisplayLink.m
-//  EZAudio
-//
-//  Created by Syed Haris Ali on 6/25/15.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-
-#import "EZAudioDisplayLink.h"
-
-//------------------------------------------------------------------------------
-#pragma mark - CVDisplayLink Callback (Declaration)
-//------------------------------------------------------------------------------
-
-#if TARGET_OS_IPHONE
-#elif TARGET_OS_MAC
-static CVReturn EZAudioDisplayLinkCallback(CVDisplayLinkRef displayLinkRef,
-                                           const CVTimeStamp *now,
-                                           const CVTimeStamp *outputTime,
-                                           CVOptionFlags flagsIn,
-                                           CVOptionFlags *flagsOut,
-                                           void   *displayLinkContext);
-#endif
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioDisplayLink (Interface Extension)
-//------------------------------------------------------------------------------
-
-@interface EZAudioDisplayLink ()
-#if TARGET_OS_IPHONE
-@property (nonatomic, strong) CADisplayLink *displayLink;
-#elif TARGET_OS_MAC
-@property (nonatomic, assign) CVDisplayLinkRef displayLink;
-#endif
-@property (nonatomic, assign) BOOL stopped;
-@end
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioDisplayLink (Implementation)
-//------------------------------------------------------------------------------
-
-@implementation EZAudioDisplayLink
-
-//------------------------------------------------------------------------------
-#pragma mark - Dealloc
-//------------------------------------------------------------------------------
-
-- (void)dealloc
-{
-#if TARGET_OS_IPHONE
-    [self.displayLink invalidate];
-#elif TARGET_OS_MAC
-    CVDisplayLinkStop(self.displayLink);
-    CVDisplayLinkRelease(self.displayLink);
-    self.displayLink = nil;
-#endif
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Class Initialization
-//------------------------------------------------------------------------------
-
-+ (instancetype)displayLinkWithDelegate:(id<EZAudioDisplayLinkDelegate>)delegate
-{
-    EZAudioDisplayLink *displayLink = [[self alloc] init];
-    displayLink.delegate = delegate;
-    return displayLink;
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Initialization
-//------------------------------------------------------------------------------
-
-- (instancetype) init
-{
-    self = [super init];
-    if (self)
-    {
-        [self setup];
-    }
-    return self;
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Setup
-//------------------------------------------------------------------------------
-
-- (void)setup
-{
-    self.stopped = YES;
-#if TARGET_OS_IPHONE
-    self.displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(update)];
-    [self.displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
-#elif TARGET_OS_MAC
-    CVDisplayLinkCreateWithActiveCGDisplays(&_displayLink);
-    CVDisplayLinkSetOutputCallback(self.displayLink,
-                                   EZAudioDisplayLinkCallback,
-                                   (__bridge void *)(self));
-    CVDisplayLinkStart(self.displayLink);
-#endif
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Actions
-//------------------------------------------------------------------------------
-
-- (void)start
-{
-#if TARGET_OS_IPHONE
-    self.displayLink.paused = NO;
-#elif TARGET_OS_MAC
-    CVDisplayLinkStart(self.displayLink);
-#endif
-    self.stopped = NO;
-}
-
-//------------------------------------------------------------------------------
-
-- (void)stop
-{
-#if TARGET_OS_IPHONE
-    self.displayLink.paused = YES;
-#elif TARGET_OS_MAC
-    CVDisplayLinkStop(self.displayLink);
-#endif
-    self.stopped = YES;
-}
-
-//------------------------------------------------------------------------------
-
-- (void)update
-{
-    if (!self.stopped)
-    {
-        if ([self.delegate respondsToSelector:@selector(displayLinkNeedsDisplay:)])
-        {
-            [self.delegate displayLinkNeedsDisplay:self];
-        }
-    }
-}
-
-//------------------------------------------------------------------------------
-
-@end
-
-//------------------------------------------------------------------------------
-#pragma mark - CVDisplayLink Callback (Implementation)
-//------------------------------------------------------------------------------
-
-#if TARGET_OS_IPHONE
-#elif TARGET_OS_MAC
-static CVReturn EZAudioDisplayLinkCallback(CVDisplayLinkRef displayLinkRef,
-                                           const CVTimeStamp *now,
-                                           const CVTimeStamp *outputTime,
-                                           CVOptionFlags flagsIn,
-                                           CVOptionFlags *flagsOut,
-                                           void   *displayLinkContext)
-{
-    EZAudioDisplayLink *displayLink = (__bridge EZAudioDisplayLink*)displayLinkContext;
-    [displayLink update];
-    return kCVReturnSuccess;
-}
-#endif

EZAudio/EZAudioFile.h

@@ -25,26 +25,10 @@
 
 #import <Foundation/Foundation.h>
 #import <AudioToolbox/AudioToolbox.h>
-#import "EZAudioFloatData.h"
-
-//------------------------------------------------------------------------------
 
 @class EZAudio;
 @class EZAudioFile;
 
-//------------------------------------------------------------------------------
-#pragma mark - Blocks
-//------------------------------------------------------------------------------
-/**
- A block used when returning back the waveform data. The waveform data itself will be an array of float arrays, one for each channel, and the length indicates the total length of each float array.
- @param waveformData An array of float arrays, each representing a channel of audio data from the file
- @param length       An int representing the length of each channel of float audio data
- */
-typedef void (^EZAudioWaveformDataCompletionBlock)(float **waveformData, int length);
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioFileDelegate
-//------------------------------------------------------------------------------
 /**
  The EZAudioFileDelegate provides event callbacks for the EZAudioFile object. These type of events are triggered by reads and seeks on the file and gives feedback such as the audio data read as a float array for visualizations and the new seek position for UI updating.
  */
@@ -58,159 +42,102 @@ typedef void (^EZAudioWaveformDataCompletionBlock)(float **waveformData, int len
  @param bufferSize       The length of the buffers float arrays
  @param numberOfChannels The number of channels. 2 for stereo, 1 for mono.
  */
-- (void)     audioFile:(EZAudioFile *)audioFile
-             readAudio:(float **)buffer
-        withBufferSize:(UInt32)bufferSize
-  withNumberOfChannels:(UInt32)numberOfChannels;
-
-//------------------------------------------------------------------------------
-
-/**
- Occurs when the audio file's internal seek position has been updated by the EZAudioFile functions `readFrames:audioBufferList:bufferSize:eof:` or `audioFile:updatedPosition:`. As of 0.8.0 this is the preferred method of listening for position updates on the audio file since a user may want the pull the currentTime, formattedCurrentTime, or the frame index from the EZAudioFile instance provided.
- @param audioFile The instance of the EZAudio in which the change occured.
- */
-- (void)audioFileUpdatedPosition:(EZAudioFile *)audioFile;
-
-//------------------------------------------------------------------------------
+-(void)     audioFile:(EZAudioFile*)audioFile
+            readAudio:(float**)buffer
+       withBufferSize:(UInt32)bufferSize
+ withNumberOfChannels:(UInt32)numberOfChannels;
 
 /**
  Occurs when the audio file's internal seek position has been updated by the EZAudioFile functions `readFrames:audioBufferList:bufferSize:eof:` or `audioFile:updatedPosition:`.
  @param audioFile     The instance of the EZAudio in which the change occured
  @param framePosition The new frame index as a 64-bit signed integer
- @deprecated This property is deprecated starting in version 0.8.0.
- @note Please use `audioFileUpdatedPosition:` property instead.
  */
-- (void)audioFile:(EZAudioFile *)audioFile
-  updatedPosition:(SInt64)framePosition  __attribute__((deprecated));
+-(void)audioFile:(EZAudioFile*)audioFile
+ updatedPosition:(SInt64)framePosition;
 
 @end
 
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioFile
-//------------------------------------------------------------------------------
 /**
  The EZAudioFile provides a lightweight and intuitive way to asynchronously interact with audio files. These interactions included reading audio data, seeking within an audio file, getting information about the file, and pulling the waveform data for visualizing the contents of the audio file. The EZAudioFileDelegate provides event callbacks for when reads, seeks, and various updates happen within the audio file to allow the caller to interact with the action in meaningful ways. Common use cases here could be to read the audio file's data as AudioBufferList structures for output (see EZOutput) and visualizing the audio file's data as a float array using an audio plot (see EZAudioPlot).
  */
-@interface EZAudioFile : NSObject <NSCopying>
+@interface EZAudioFile : NSObject
+
+#pragma mark - Blocks
+/**
+ A block used when returning back the waveform data. The waveform data itself will be an array of float values and the length indicates the total length of the float array.
+ @param waveformData An array of float values representing the amplitude data from the audio waveform
+ @param length       The length of the waveform data's float array
+ */
+typedef void (^WaveformDataCompletionBlock)(float *waveformData, UInt32 length);
 
-//------------------------------------------------------------------------------
 #pragma mark - Properties
-//------------------------------------------------------------------------------
-
 /**
  A EZAudioFileDelegate for the audio file that is used to return events such as new seek positions within the file and the read audio data as a float array.
  */
-@property (nonatomic, weak) id<EZAudioFileDelegate> delegate;
+@property (nonatomic,assign) id<EZAudioFileDelegate> audioFileDelegate;
 
-//------------------------------------------------------------------------------
-#pragma mark - Initialization
-//------------------------------------------------------------------------------
 /**
- @name Initialization
-*/
+ The resolution of the waveform data. This value specifies how the recommendedDrawingFrameRate chooses itself. A low value like 128 will render a waveform containing 128 points representing a low resolution waveform while a high value like 4096 will render a high quality waveform. Higher resolutions provide more detail, but take more work to render in the audio waveform plots (EZAudioPlot or EZAudioPlotGL) while lower resolutions providel less detail, but work better for displaying many at a time (like in a UITableView)
+ */
+@property (nonatomic,assign) UInt32 waveformResolution;
+
+#pragma mark - Initializers
+///-----------------------------------------------------------
+/// @name Initializers
+///-----------------------------------------------------------
 
 /**
  Creates a new instance of the EZAudioFile using a file path URL.
  @param url The file path reference of the audio file as an NSURL.
- @return The newly created EZAudioFile instance. nil if the file path does not exist.
- */
-- (instancetype)initWithURL:(NSURL *)url;
-
-/**
- Creates a new instance of the EZAudioFile using a file path URL with a delegate conforming to the EZAudioFileDelegate protocol.
- @param delegate The audio file delegate that receives events specified by the EZAudioFileDelegate protocol
- @param url The file path reference of the audio file as an NSURL.
  @return The newly created EZAudioFile instance.
  */
-- (instancetype)initWithURL:(NSURL *)url
-                   delegate:(id<EZAudioFileDelegate>)delegate;
-
-//------------------------------------------------------------------------------
+-(EZAudioFile*)initWithURL:(NSURL*)url;
 
 /**
- Creates a new instance of the EZAudioFile using a file path URL with a delegate conforming to the EZAudioFileDelegate protocol and a client format.
+ Creates a new instance of the EZAudioFile using a file path URL and allows specifying an EZAudioFileDelegate.
  @param url      The file path reference of the audio file as an NSURL.
  @param delegate The audio file delegate that receives events specified by the EZAudioFileDelegate protocol
- @param clientFormat An AudioStreamBasicDescription that will be used as the client format on the audio file. For instance, the audio file might be in a 22.5 kHz sample rate format in its file format, but your app wants to read the samples at a sample rate of 44.1 kHz so it can iterate with other components (like a audio processing graph) without any weird playback effects. If this initializer is not used then a non-interleaved float format will be assumed.
  @return The newly created EZAudioFile instance.
  */
-- (instancetype)initWithURL:(NSURL *)url
-                   delegate:(id<EZAudioFileDelegate>)delegate
-               clientFormat:(AudioStreamBasicDescription)clientFormat;
+-(EZAudioFile*)initWithURL:(NSURL*)url
+               andDelegate:(id<EZAudioFileDelegate>)delegate;
 
-//------------------------------------------------------------------------------
 #pragma mark - Class Initializers
-//------------------------------------------------------------------------------
-/**
- @name Class Initializers
- */
+///-----------------------------------------------------------
+/// @name Class Initializers
+///-----------------------------------------------------------
 
 /**
  Class method that creates a new instance of the EZAudioFile using a file path URL.
  @param url The file path reference of the audio file as an NSURL.
  @return The newly created EZAudioFile instance.
  */
-+ (instancetype)audioFileWithURL:(NSURL *)url;
-
-//------------------------------------------------------------------------------
++(EZAudioFile*)audioFileWithURL:(NSURL*)url;
 
 /**
- Class method that creates a new instance of the EZAudioFile using a file path URL with a delegate conforming to the EZAudioFileDelegate protocol.
- @param url The file path reference of the audio file as an NSURL.
+ Class method that creates a new instance of the EZAudioFile using a file path URL and allows specifying an EZAudioFileDelegate.
+ @param url      The file path reference of the audio file as an NSURL.
  @param delegate The audio file delegate that receives events specified by the EZAudioFileDelegate protocol
  @return The newly created EZAudioFile instance.
  */
-+ (instancetype)audioFileWithURL:(NSURL *)url
-                        delegate:(id<EZAudioFileDelegate>)delegate;
++(EZAudioFile*)audioFileWithURL:(NSURL*)url
+                    andDelegate:(id<EZAudioFileDelegate>)delegate;
 
-//------------------------------------------------------------------------------
-
-/**
- Class method that creates a new instance of the EZAudioFile using a file path URL with a delegate conforming to the EZAudioFileDelegate protocol and a client format.
- @param url The file path reference of the audio file as an NSURL.
- @param delegate The audio file delegate that receives events specified by the EZAudioFileDelegate protocol
- @param clientFormat An AudioStreamBasicDescription that will be used as the client format on the audio file. For instance, the audio file might be in a 22.5 kHz sample rate, interleaved MP3 file format, but your app wants to read linear PCM samples at a sample rate of 44.1 kHz so it can be read in the context of other components sharing a common stream format (like a audio processing graph). If this initializer is not used then the `defaultClientFormat` will be used as teh default value for the client format.
- @return The newly created EZAudioFile instance.
- */
-+ (instancetype)audioFileWithURL:(NSURL *)url
-                        delegate:(id<EZAudioFileDelegate>)delegate
-                    clientFormat:(AudioStreamBasicDescription)clientFormat;
-
-//------------------------------------------------------------------------------
 #pragma mark - Class Methods
-//------------------------------------------------------------------------------
-/**
- @name Class Methods
- */
-
-/**
- A class method that subclasses can override to specify the default client format that will be used to read audio data from this file. A client format is different from the file format in that it is the format of the other components interacting with this file. For instance, the file on disk could be a 22.5 kHz, float format, but we might have an audio processing graph that has a 44.1 kHz, signed integer format that we'd like to interact with. The client format lets us set that 44.1 kHz format on the audio file to properly read samples from it with any interpolation or format conversion that must take place done automatically within the EZAudioFile `readFrames:audioBufferList:bufferSize:eof:` method. Default is stereo, non-interleaved, 44.1 kHz.
- @return An AudioStreamBasicDescription that serves as the audio file's client format.
- */
-+ (AudioStreamBasicDescription)defaultClientFormat;
-
-//------------------------------------------------------------------------------
-
-/**
- A class method that subclasses can override to specify the default sample rate that will be used in the `defaultClientFormat` method. Default is 44100.0 (44.1 kHz).
- @return A Float64 representing the sample rate that should be used in the default client format.
- */
-+ (Float64)defaultClientFormatSampleRate;
-
-//------------------------------------------------------------------------------
+///-----------------------------------------------------------
+/// @name Class Methods
+///-----------------------------------------------------------
 
 /**
  Provides an array of the supported audio files types. Each audio file type is provided as a string, i.e. @"caf". Useful for filtering lists of files in an open panel to only the types allowed.
  @return An array of NSString objects representing the represented file types.
  */
-+ (NSArray *)supportedAudioFileTypes;
++(NSArray*)supportedAudioFileTypes;
 
-//------------------------------------------------------------------------------
 #pragma mark - Events
-//------------------------------------------------------------------------------
-/**
- @name Reading From The Audio File
- */
+///-----------------------------------------------------------
+/// @name Reading The Audio File
+///-----------------------------------------------------------
 
 /**
  Reads a specified number of frames from the audio file. In addition, this will notify the EZAudioFileDelegate (if specified) of the read data as a float array with the audioFile:readAudio:withBufferSize:withNumberOfChannels: event and the new seek position within the file with the audioFile:updatedPosition: event.
@@ -219,162 +146,96 @@ typedef void (^EZAudioWaveformDataCompletionBlock)(float **waveformData, int len
  @param bufferSize      A pointer to a UInt32 in which to store the read buffersize
  @param eof             A pointer to a BOOL in which to store whether the read operation reached the end of the audio file.
  */
-- (void)readFrames:(UInt32)frames
-   audioBufferList:(AudioBufferList *)audioBufferList
-        bufferSize:(UInt32 *)bufferSize
-               eof:(BOOL *)eof;
+-(void)readFrames:(UInt32)frames
+  audioBufferList:(AudioBufferList*)audioBufferList
+       bufferSize:(UInt32*)bufferSize
+              eof:(BOOL*)eof;
 
-//------------------------------------------------------------------------------
-
-/**
- @name Seeking Through The Audio File
- */
+///-----------------------------------------------------------
+/// @name Seeking Through The Audio File
+///-----------------------------------------------------------
 
 /**
  Seeks through an audio file to a specified frame. This will notify the EZAudioFileDelegate (if specified) with the audioFile:updatedPosition: function.
  @param frame The new frame position to seek to as a SInt64.
  */
-- (void)seekToFrame:(SInt64)frame;
+-(void)seekToFrame:(SInt64)frame;
 
-//------------------------------------------------------------------------------
 #pragma mark - Getters
-//------------------------------------------------------------------------------
-/**
- @name Getting Information About The Audio File
- */
+///-----------------------------------------------------------
+/// @name Getting Information About The Audio File
+///-----------------------------------------------------------
 
 /**
- Provides the common AudioStreamBasicDescription that will be used for in-app interaction. The file's format will be converted to this format and then sent back as either a float array or a `AudioBufferList` pointer. For instance, the file on disk could be a 22.5 kHz, float format, but we might have an audio processing graph that has a 44.1 kHz, signed integer format that we'd like to interact with. The client format lets us set that 44.1 kHz format on the audio file to properly read samples from it with any interpolation or format conversion that must take place done automatically within the EZAudioFile `readFrames:audioBufferList:bufferSize:eof:` method. Default is stereo, non-interleaved, 44.1 kHz.
- @warning This must be a linear PCM format!
+ Provides the AudioStreamBasicDescription structure used within the app. The file's format will be converted to this format and then sent back as either a float array or a `AudioBufferList` pointer. Use this when communicating with other EZAudio components.
  @return An AudioStreamBasicDescription structure describing the format of the audio file.
  */
-@property (readwrite) AudioStreamBasicDescription clientFormat;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the current offset in the audio file as an NSTimeInterval (i.e. in seconds).  When setting this it will determine the correct frame offset and perform a `seekToFrame` to the new time offset. 
- @warning Make sure the new current time offset is less than the `duration` or you will receive an invalid seek assertion.
- */
-@property (nonatomic, readwrite) NSTimeInterval currentTime;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the duration of the audio file in seconds.
- */
-@property (readonly) NSTimeInterval duration;
-
-//------------------------------------------------------------------------------
+-(AudioStreamBasicDescription)clientFormat;
 
 /**
  Provides the AudioStreamBasicDescription structure containing the format of the file.
  @return An AudioStreamBasicDescription structure describing the format of the audio file.
  */
-@property (readonly) AudioStreamBasicDescription fileFormat;
-
-//------------------------------------------------------------------------------
+-(AudioStreamBasicDescription)fileFormat;
 
 /**
- Provides the current time as an NSString with the time format MM:SS.
- */
-@property (readonly) NSString *formattedCurrentTime;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the duration as an NSString with the time format MM:SS.
- */
-@property (readonly) NSString *formattedDuration;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the frame index (a.k.a the seek positon) within the audio file as SInt64. This can be helpful when seeking through the audio file.
+ Provides the frame index (a.k.a the seek positon) within the audio file as an integer. This can be helpful when seeking through the audio file.
  @return The current frame index within the audio file as a SInt64.
  */
-@property (readonly) SInt64 frameIndex;
-
-//------------------------------------------------------------------------------
+-(SInt64)frameIndex;
 
 /**
  Provides a dictionary containing the metadata (ID3) tags that are included in the header for the audio file. Typically this contains stuff like artist, title, release year, etc.
  @return An NSDictionary containing the metadata for the audio file.
  */
-@property (readonly) NSDictionary *metadata;
-
-//------------------------------------------------------------------------------
+-(NSDictionary *)metadata;
 
 /**
  Provides the total duration of the audio file in seconds.
- @deprecated This property is deprecated starting in version 0.3.0.
- @note Please use `duration` property instead.
  @return The total duration of the audio file as a Float32.
  */
-@property (readonly) NSTimeInterval totalDuration __attribute__((deprecated));
-
-//------------------------------------------------------------------------------
+-(Float32)totalDuration;
 
 /**
- Provides the total frame count of the audio file in the client format.
- @return The total number of frames in the audio file in the AudioStreamBasicDescription representing the client format as a SInt64.
+ Provides the total frame count of the audio file.
+ @return The total number of frames in the audio file as a SInt64.
  */
-@property (readonly) SInt64 totalClientFrames;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the total frame count of the audio file in the file format.
- @return The total number of frames in the audio file in the AudioStreamBasicDescription representing the file format as a SInt64.
- */
-@property (readonly) SInt64 totalFrames;
-
-//------------------------------------------------------------------------------
+-(SInt64)totalFrames;
 
 /**
  Provides the NSURL for the audio file.
  @return An NSURL representing the path of the EZAudioFile instance.
  */
-@property (nonatomic, copy, readonly) NSURL *url;
+-(NSURL*)url;
 
-//------------------------------------------------------------------------------
 #pragma mark - Helpers
-//------------------------------------------------------------------------------
+///-----------------------------------------------------------
+/// @name Manipulating The Audio Data
+///-----------------------------------------------------------
 
 /**
- Synchronously pulls the waveform amplitude data into a float array for the receiver. This returns a waveform with a default resolution of 1024, meaning there are 1024 data points to plot the waveform.
- @param numberOfPoints A UInt32 representing the number of data points you need. The higher the number of points the more detailed the waveform will be.
- @return A EZAudioFloatData instance containing the audio data for all channels of the audio.
+ Tells the caller whether the EZAudioFile has cached waveform data that was loaded via the getWaveformDataWithCompletionBlock: function.
+ *  @return A BOOL indicating whether there is cached waveform data
  */
-- (EZAudioFloatData *)getWaveformData;
-
-//------------------------------------------------------------------------------
-
-/**
- Synchronously pulls the waveform amplitude data into a float array for the receiver.
-  @param numberOfPoints A UInt32 representing the number of data points you need. The higher the number of points the more detailed the waveform will be.
- @return A EZAudioFloatData instance containing the audio data for all channels of the audio.
- */
-- (EZAudioFloatData *)getWaveformDataWithNumberOfPoints:(UInt32)numberOfPoints;
-
-//------------------------------------------------------------------------------
-
-/**
- Asynchronously pulls the waveform amplitude data into a float array for the receiver. This returns a waveform with a default resolution of 1024, meaning there are 1024 data points to plot the waveform.
- @param completion A EZAudioWaveformDataCompletionBlock that executes when the waveform data has been extracted. Provides a `EZAudioFloatData` instance containing the waveform data for all audio channels.
- */
-- (void)getWaveformDataWithCompletionBlock:(EZAudioWaveformDataCompletionBlock)completion;
-
-//------------------------------------------------------------------------------
+-(BOOL)hasLoadedAudioData;
 
 /**
  Asynchronously pulls the waveform amplitude data into a float array for the receiver.
- @param numberOfPoints A UInt32 representing the number of data points you need. The higher the number of points the more detailed the waveform will be.
- @param completion A EZAudioWaveformDataCompletionBlock that executes when the waveform data has been extracted. Provides a `EZAudioFloatData` instance containing the waveform data for all audio channels.
+ @param waveformDataCompletionBlock A WaveformDataCompletionBlock that executes when the waveform data has been extracted. Provides the waveform data as a float array and the length of the array.
  */
-- (void)getWaveformDataWithNumberOfPoints:(UInt32)numberOfPoints
-                               completion:(EZAudioWaveformDataCompletionBlock)completion;
+-(void)getWaveformDataWithCompletionBlock:(WaveformDataCompletionBlock)waveformDataCompletionBlock;
 
-//------------------------------------------------------------------------------
+/**
+ Provides the minimum number of buffers that would be required with the constant frames read rate provided.
+ @param frameRate A constant frame rate to use when calculating the number of buffers needed as a UInt32.
+ @return The minimum number of buffers required for the constant frames read rate provided as a UInt32.
+ */
+-(UInt32)minBuffersWithFrameRate:(UInt32)frameRate;
+
+/**
+ Provides a frame rate to use when drawing and averaging a bin of values to create each point in a graph. The ideal amount of end buffers seems to be between 1000-3000 so we determine a frame rate per audio file that can achieve a high degree of detail for the entire waveform.
+ @return A frame rate value as a UInt32 to use when reading frames in a file.
+ */
+-(UInt32)recommendedDrawingFrameRate;
 
 @end

EZAudio/EZAudioFile.m

@@ -24,706 +24,343 @@
 //  THE SOFTWARE.
 
 #import "EZAudioFile.h"
+#import "AEFloatConverter.h"
+#import "EZAudioUtilities.h"
 
-//------------------------------------------------------------------------------
+#define kEZAudioFileWaveformDefaultResolution (1024)
 
-#import "EZAudio.h"
-#import "EZAudioFloatConverter.h"
-#import "EZAudioFloatData.h"
-#include <pthread.h>
-
-// constants
-static UInt32 EZAudioFileWaveformDefaultResolution = 1024;
-static NSString *EZAudioFileWaveformDataQueueIdentifier = @"com.ezaudio.waveformQueue";
-
-//------------------------------------------------------------------------------
-
-typedef struct
-{
-    AudioFileID                 audioFileID;
-    AudioStreamBasicDescription clientFormat;
-    NSTimeInterval              duration;
-    ExtAudioFileRef             extAudioFileRef;
-    AudioStreamBasicDescription fileFormat;
-    SInt64                      frames;
-    CFURLRef                    sourceURL;
-} EZAudioFileInfo;
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioFile
-//------------------------------------------------------------------------------
-
-@interface EZAudioFile ()
-@property (nonatomic, strong) EZAudioFloatConverter  *floatConverter;
-@property (nonatomic)         float                 **floatData;
-@property (nonatomic)         EZAudioFileInfo        *info;
-@property (nonatomic)         pthread_mutex_t         lock;
-@property (nonatomic)         dispatch_queue_t        waveformQueue;
+@interface EZAudioFile (){
+  
+  // Reading from the audio file
+  ExtAudioFileRef             _audioFile;
+  AudioStreamBasicDescription _clientFormat;
+  AudioStreamBasicDescription _fileFormat;
+  float                       **_floatBuffers;
+  AEFloatConverter            *_floatConverter;
+  SInt64                      _frameIndex;
+  CFURLRef                    _sourceURL;
+  Float32                     _totalDuration;
+  SInt64                      _totalFrames;
+  
+  // Waveform Data
+  float  *_waveformData;
+  UInt32 _waveformFrameRate;
+  UInt32 _waveformTotalBuffers;
+  
+}
 @end
 
-//------------------------------------------------------------------------------
-
 @implementation EZAudioFile
+@synthesize audioFileDelegate = _audioFileDelegate;
+@synthesize waveformResolution = _waveformResolution;
 
-//------------------------------------------------------------------------------
-#pragma mark - Dealloc
-//------------------------------------------------------------------------------
-
-- (void)dealloc
-{
-    self.floatConverter = nil;
-    pthread_mutex_destroy(&_lock);
-    [EZAudioUtilities freeFloatBuffers:self.floatData numberOfChannels:self.clientFormat.mChannelsPerFrame];
-    [EZAudioUtilities checkResult:ExtAudioFileDispose(self.info->extAudioFileRef) operation:"Failed to dispose of ext audio file"];
-    free(self.info);
+#pragma mark - Initializers
+-(EZAudioFile*)initWithURL:(NSURL*)url {
+  self = [super init];
+  if(self){
+    _sourceURL = (__bridge CFURLRef)url;
+    [self _configureAudioFile];
+  }
+  return self;
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Initialization
-//------------------------------------------------------------------------------
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self)
-    {
-        self.info = (EZAudioFileInfo *)malloc(sizeof(EZAudioFileInfo));
-        _floatData = NULL;
-        pthread_mutex_init(&_lock, NULL);
-        _waveformQueue = dispatch_queue_create(EZAudioFileWaveformDataQueueIdentifier.UTF8String, DISPATCH_QUEUE_PRIORITY_DEFAULT);
-    }
-    return self;
+-(EZAudioFile *)initWithURL:(NSURL *)url andDelegate:(id<EZAudioFileDelegate>)delegate {
+  self = [self initWithURL:url];
+  if(self){
+    self.audioFileDelegate = delegate;
+  }
+  return self;
 }
 
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithURL:(NSURL *)url
-{
-    return [self initWithURL:url delegate:nil];
-}
-
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithURL:(NSURL *)url
-                   delegate:(id<EZAudioFileDelegate>)delegate
-{
-    return [self initWithURL:url
-                    delegate:delegate
-                clientFormat:[self.class defaultClientFormat]];
-}
-
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithURL:(NSURL *)url
-                   delegate:(id<EZAudioFileDelegate>)delegate
-               clientFormat:(AudioStreamBasicDescription)clientFormat
-{
-    self = [self init];
-    if (self)
-    {
-        self.info->sourceURL = (__bridge CFURLRef)(url);
-        self.info->clientFormat = clientFormat;
-        self.delegate = delegate;
-        if (![self setup])
-        {
-            return nil;
-        }
-    }
-    return self;
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - Class Initializers
-//------------------------------------------------------------------------------
-
-+ (instancetype)audioFileWithURL:(NSURL *)url
-{
-    return [[self alloc] initWithURL:url];
++(EZAudioFile*)audioFileWithURL:(NSURL*)url {
+  return [[EZAudioFile alloc] initWithURL:url];
 }
 
-//------------------------------------------------------------------------------
-
-+ (instancetype)audioFileWithURL:(NSURL *)url
-                        delegate:(id<EZAudioFileDelegate>)delegate
-{
-    return [[self alloc] initWithURL:url delegate:delegate];
++(EZAudioFile *)audioFileWithURL:(NSURL *)url andDelegate:(id<EZAudioFileDelegate>)delegate {
+  return [[EZAudioFile alloc] initWithURL:url andDelegate:delegate];
 }
 
-//------------------------------------------------------------------------------
-
-+ (instancetype)audioFileWithURL:(NSURL *)url
-                        delegate:(id<EZAudioFileDelegate>)delegate
-                    clientFormat:(AudioStreamBasicDescription)clientFormat
-{
-    return [[self alloc] initWithURL:url
-                            delegate:delegate
-                        clientFormat:clientFormat];
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - NSCopying
-//------------------------------------------------------------------------------
-
-- (id)copyWithZone:(NSZone *)zone
-{
-    return [EZAudioFile audioFileWithURL:self.url];
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - Class Methods
-//------------------------------------------------------------------------------
-
-+ (AudioStreamBasicDescription)defaultClientFormat
-{
-    return [EZAudioUtilities stereoFloatNonInterleavedFormatWithSampleRate:[self defaultClientFormatSampleRate]];
++(NSArray *)supportedAudioFileTypes {
+  return @[ @"aac",
+            @"caf",
+            @"aif",
+            @"aiff",
+            @"aifc",
+            @"mp3",
+            @"mp4",
+            @"m4a",
+            @"snd",
+            @"au",
+            @"sd2",
+            @"wav" ];
 }
 
-//------------------------------------------------------------------------------
-
-+ (Float64)defaultClientFormatSampleRate
-{
-    return 44100.0f;
+#pragma mark - Private Configuation
+-(void)_configureAudioFile {
+  
+  // Source URL should not be nil
+  NSAssert(_sourceURL,@"Source URL was not specified correctly.");
+  
+  // Try to open the file for reading
+  [EZAudioUtilities checkResult:ExtAudioFileOpenURL(_sourceURL,&_audioFile)
+             operation:"Failed to open audio file for reading"];
+  
+  // Try pulling the stream description
+  UInt32 size = sizeof(_fileFormat);
+  [EZAudioUtilities checkResult:ExtAudioFileGetProperty(_audioFile,kExtAudioFileProperty_FileDataFormat, &size, &_fileFormat)
+             operation:"Failed to get audio stream basic description of input file"];
+  
+  // Try pulling the total frame size
+  size = sizeof(_totalFrames);
+  [EZAudioUtilities checkResult:ExtAudioFileGetProperty(_audioFile,kExtAudioFileProperty_FileLengthFrames, &size, &_totalFrames)
+             operation:"Failed to get total frames of input file"];
+  _totalFrames = MAX(1, _totalFrames);
+  
+  // Total duration
+  _totalDuration = _totalFrames / _fileFormat.mSampleRate;
+  
+  // Set the client format on the stream
+  switch (_fileFormat.mChannelsPerFrame) {
+    case 1:
+      _clientFormat = [EZAudioUtilities monoFloatFormatWithSampleRate:_fileFormat.mSampleRate];
+      break;
+    case 2:
+      _clientFormat = [EZAudioUtilities stereoFloatInterleavedFormatWithSampleRate:_fileFormat.mSampleRate];
+      break;
+    default:
+      break;
+  }
+    
+  [EZAudioUtilities checkResult:ExtAudioFileSetProperty(_audioFile,
+                                               kExtAudioFileProperty_ClientDataFormat,
+                                               sizeof (AudioStreamBasicDescription),
+                                               &_clientFormat)
+             operation:"Couldn't set client data format on input ext file"];
+  
+  // Allocate the float buffers
+  _floatConverter = [[AEFloatConverter alloc] initWithSourceFormat:_clientFormat];
+  size_t sizeToAllocate = sizeof(float*) * _clientFormat.mChannelsPerFrame;
+  sizeToAllocate = MAX(8, sizeToAllocate);
+  _floatBuffers   = (float**)malloc( sizeToAllocate);
+  UInt32 outputBufferSize = 32 * 1024; // 32 KB
+  for ( int i=0; i< _clientFormat.mChannelsPerFrame; i++) {
+    _floatBuffers[i] = (float*)malloc(outputBufferSize);
+  }
+  
+    [EZAudioUtilities printASBD:_fileFormat];
+    
+  // There's no waveform data yet
+  _waveformData = NULL;
+  
+  // Set the default resolution for the waveform data
+  _waveformResolution = kEZAudioFileWaveformDefaultResolution;
+  
 }
 
-//------------------------------------------------------------------------------
-
-+ (NSArray *)supportedAudioFileTypes
-{
-    return @
-    [
-        @"aac",
-        @"caf",
-        @"aif",
-        @"aiff",
-        @"aifc",
-        @"mp3",
-        @"mp4",
-        @"m4a",
-        @"snd",
-        @"au",
-        @"sd2",
-        @"wav"
-    ];
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Setup
-//------------------------------------------------------------------------------
-
-- (BOOL)setup
-{
-    //
-    // Try to open the file, bail if the file could not be opened
-    //
-    BOOL success = [self openAudioFile];
-    if (!success)
-    {
-        return success;
-    }
-    
-    //
-    // Set the client format
-    //
-    self.clientFormat = self.info->clientFormat;
-    
-    return YES;
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Creating/Opening Audio File
-//------------------------------------------------------------------------------
-
-- (BOOL)openAudioFile
-{
-    //
-    // Need a source url
-    //
-    NSAssert(self.info->sourceURL, @"EZAudioFile cannot be created without a source url!");
-    
-    //
-    // Determine if the file actually exists
-    //
-    CFURLRef url = self.info->sourceURL;
-    NSURL *fileURL = (__bridge NSURL *)(url);
-    BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:fileURL.path];
-    
-    //
-    // Create an ExtAudioFileRef for the file handle
-    //
-    if (fileExists)
-    {
-        [EZAudioUtilities checkResult:ExtAudioFileOpenURL(url, &self.info->extAudioFileRef)
-                            operation:"Failed to create ExtAudioFileRef"];
-    }
-    else
-    {
-        return NO;
-    }
-    
-    //
-    // Get the underlying AudioFileID
-    //
-    UInt32 propSize = sizeof(self.info->audioFileID);
-    [EZAudioUtilities checkResult:ExtAudioFileGetProperty(self.info->extAudioFileRef,
-                                                          kExtAudioFileProperty_AudioFile,
-                                                          &propSize,
-                                                          &self.info->audioFileID)
-                        operation:"Failed to get underlying AudioFileID"];
-    
-    //
-    // Store the file format
-    //
-    propSize = sizeof(self.info->fileFormat);
-    [EZAudioUtilities checkResult:ExtAudioFileGetProperty(self.info->extAudioFileRef,
-                                                          kExtAudioFileProperty_FileDataFormat,
-                                                          &propSize,
-                                                          &self.info->fileFormat)
-                        operation:"Failed to get file audio format on existing audio file"];
-    
-    //
-    // Get the total frames and duration
-    //
-    propSize = sizeof(SInt64);
-    [EZAudioUtilities checkResult:ExtAudioFileGetProperty(self.info->extAudioFileRef,
-                                                          kExtAudioFileProperty_FileLengthFrames,
-                                                          &propSize,
-                                                          &self.info->frames)
-                        operation:"Failed to get total frames"];
-    self.info->duration = (NSTimeInterval) self.info->frames / self.info->fileFormat.mSampleRate;
-    
-    return YES;
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - Events
-//------------------------------------------------------------------------------
-
-- (void)readFrames:(UInt32)frames
-    audioBufferList:(AudioBufferList *)audioBufferList
-         bufferSize:(UInt32 *)bufferSize
-               eof:(BOOL *)eof
-{
-    if (pthread_mutex_trylock(&_lock) == 0)
-    {
-        // perform read
-        [EZAudioUtilities checkResult:ExtAudioFileRead(self.info->extAudioFileRef,
-                                                       &frames,
-                                                       audioBufferList)
-                            operation:"Failed to read audio data from file"];
-        *bufferSize = frames;
-        *eof = frames == 0;
-        
-        //
-        // Notify delegate
-        //
-        if ([self.delegate respondsToSelector:@selector(audioFileUpdatedPosition:)])
-        {
-            [self.delegate audioFileUpdatedPosition:self];
-        }
-        
-        //
-        // Deprecated, but supported until 1.0
-        //
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-        if ([self.delegate respondsToSelector:@selector(audioFile:updatedPosition:)])
-        {
-            [self.delegate audioFile:self updatedPosition:[self frameIndex]];
-        }
-#pragma GCC diagnostic pop
-        
-        if ([self.delegate respondsToSelector:@selector(audioFile:readAudio:withBufferSize:withNumberOfChannels:)])
-        {
-            // convert into float data
-            [self.floatConverter convertDataFromAudioBufferList:audioBufferList
-                                             withNumberOfFrames:*bufferSize
-                                                 toFloatBuffers:self.floatData];
-            
-            // notify delegate
-            UInt32 channels = self.clientFormat.mChannelsPerFrame;
-            [self.delegate audioFile:self
-                           readAudio:self.floatData
-                      withBufferSize:*bufferSize
-                withNumberOfChannels:channels];
-        }
-        
-        pthread_mutex_unlock(&_lock);
-        
+-(void)readFrames:(UInt32)frames
+  audioBufferList:(AudioBufferList *)audioBufferList
+       bufferSize:(UInt32 *)bufferSize
+              eof:(BOOL *)eof {
+    [EZAudioUtilities checkResult:ExtAudioFileRead(_audioFile,
+                                          &frames,
+                                          audioBufferList)
+               operation:"Failed to read audio data from audio file"];
+    *bufferSize = audioBufferList->mBuffers[0].mDataByteSize/sizeof(float);
+    *eof = frames == 0;
+    _frameIndex += frames;
+    if (self.audioFileDelegate){
+      if ([self.audioFileDelegate respondsToSelector:@selector(audioFile:updatedPosition:)]){
+        [self.audioFileDelegate audioFile:self
+                          updatedPosition:_frameIndex];
+      }
+      if ([self.audioFileDelegate respondsToSelector:@selector(audioFile:readAudio:withBufferSize:withNumberOfChannels:)]){
+        AEFloatConverterToFloat(_floatConverter,audioBufferList,_floatBuffers,frames);
+        [self.audioFileDelegate audioFile:self
+                                readAudio:_floatBuffers
+                           withBufferSize:frames
+                     withNumberOfChannels:_clientFormat.mChannelsPerFrame];
+      }
     }
 }
 
-//------------------------------------------------------------------------------
-
-- (void)seekToFrame:(SInt64)frame
-{
-    if (pthread_mutex_trylock(&_lock) == 0)
-    {
-        [EZAudioUtilities checkResult:ExtAudioFileSeek(self.info->extAudioFileRef,
-                                                       frame)
-                   operation:"Failed to seek frame position within audio file"];
-
-        pthread_mutex_unlock(&_lock);
-        
-        //
-        // Notify delegate
-        //
-        if ([self.delegate respondsToSelector:@selector(audioFileUpdatedPosition:)])
-        {
-            [self.delegate audioFileUpdatedPosition:self];
-        }
-        
-        //
-        // Deprecated, but supported until 1.0
-        //
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-        if ([self.delegate respondsToSelector:@selector(audioFile:updatedPosition:)])
-        {
-            [self.delegate audioFile:self updatedPosition:[self frameIndex]];
-        }
-#pragma GCC diagnostic pop
+-(void)seekToFrame:(SInt64)frame {
+  [EZAudioUtilities checkResult:ExtAudioFileSeek(_audioFile,frame)
+             operation:"Failed to seek frame position within audio file"];
+  _frameIndex = frame;
+  if (self.audioFileDelegate){
+    if ([self.audioFileDelegate respondsToSelector:@selector(audioFile:updatedPosition:)]){
+      [self.audioFileDelegate audioFile:self updatedPosition:_frameIndex];
     }
+  }
 }
 
-//------------------------------------------------------------------------------
 #pragma mark - Getters
-//------------------------------------------------------------------------------
-
-- (AudioStreamBasicDescription)floatFormat
-{
-    return [EZAudioUtilities stereoFloatNonInterleavedFormatWithSampleRate:44100.0f];
+-(BOOL)hasLoadedAudioData {
+  return _waveformData != NULL;
 }
 
-//------------------------------------------------------------------------------
-
-- (EZAudioFloatData *)getWaveformData
-{
-    return [self getWaveformDataWithNumberOfPoints:EZAudioFileWaveformDefaultResolution];
-}
-
-//------------------------------------------------------------------------------
-
-- (EZAudioFloatData *)getWaveformDataWithNumberOfPoints:(UInt32)numberOfPoints
-{
-    EZAudioFloatData *waveformData;
-    if (pthread_mutex_trylock(&_lock) == 0)
-    {
-        // store current frame
-        SInt64 currentFrame = self.frameIndex;
-        BOOL interleaved = [EZAudioUtilities isInterleaved:self.clientFormat];
-        UInt32 channels = self.clientFormat.mChannelsPerFrame;
-        float **data = (float **)malloc( sizeof(float*) * channels );
-        for (int i = 0; i < channels; i++)
-        {
-            data[i] = (float *)malloc( sizeof(float) * numberOfPoints );
-        }
-        
-        // seek to 0
-        [EZAudioUtilities checkResult:ExtAudioFileSeek(self.info->extAudioFileRef,
-                                                       0)
-                            operation:"Failed to seek frame position within audio file"];
-        
-        // calculate the required number of frames per buffer
-        SInt64 framesPerBuffer = ((SInt64) self.totalClientFrames / numberOfPoints);
-        SInt64 framesPerChannel = framesPerBuffer / channels;
-        
-        // allocate an audio buffer list
-        AudioBufferList *audioBufferList = [EZAudioUtilities audioBufferListWithNumberOfFrames:(UInt32)framesPerBuffer
-                                                                              numberOfChannels:self.info->clientFormat.mChannelsPerFrame
-                                                                                   interleaved:interleaved];
-        
-        // read through file and calculate rms at each point
-        for (SInt64 i = 0; i < numberOfPoints; i++)
-        {
-            UInt32 bufferSize = (UInt32) framesPerBuffer;
-            [EZAudioUtilities checkResult:ExtAudioFileRead(self.info->extAudioFileRef,
-                                                           &bufferSize,
-                                                           audioBufferList)
-                                operation:"Failed to read audio data from file waveform"];
-            if (interleaved)
-            {
-                float *buffer = (float *)audioBufferList->mBuffers[0].mData;
-                for (int channel = 0; channel < channels; channel++)
-                {
-                    float channelData[framesPerChannel];
-                    for (int frame = 0; frame < framesPerChannel; frame++)
-                    {
-                        channelData[frame] = buffer[frame * channels + channel];
-                    }
-                    float rms = [EZAudioUtilities RMS:channelData length:(UInt32)framesPerChannel];
-                    data[channel][i] = rms;
-                }
-            }
-            else
-            {
-                for (int channel = 0; channel < channels; channel++)
-                {
-                    float *channelData = audioBufferList->mBuffers[channel].mData;
-                    float rms = [EZAudioUtilities RMS:channelData length:bufferSize];
-                    data[channel][i] = rms;
-                }
-            }
-        }
-        
-        // clean up
-        [EZAudioUtilities freeBufferList:audioBufferList];
-        
-        // seek back to previous position
-        [EZAudioUtilities checkResult:ExtAudioFileSeek(self.info->extAudioFileRef,
-                                                       currentFrame)
-                            operation:"Failed to seek frame position within audio file"];
-        
-        pthread_mutex_unlock(&_lock);
-        
-        waveformData = [EZAudioFloatData dataWithNumberOfChannels:channels
-                                                          buffers:(float **)data
-                                                       bufferSize:numberOfPoints];
-        
-        // cleanup
-        for (int i = 0; i < channels; i++)
-        {
-            free(data[i]);
-        }
-        free(data);
+-(void)getWaveformDataWithCompletionBlock:(WaveformDataCompletionBlock)waveformDataCompletionBlock {
+  
+  SInt64 currentFramePosition = _frameIndex;
+  
+  if (_waveformData != NULL){
+    waveformDataCompletionBlock( _waveformData, _waveformTotalBuffers);
+    return;
+  }
+  
+  _waveformFrameRate    = [self recommendedDrawingFrameRate];
+  _waveformTotalBuffers = [self minBuffersWithFrameRate:_waveformFrameRate];
+  _waveformData         = (float*)malloc(sizeof(float)*_waveformTotalBuffers);
+  
+  if (self.totalFrames == 0){
+    waveformDataCompletionBlock( _waveformData, _waveformTotalBuffers);
+    return;
+  }
+  
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0ul), ^{
+    
+    for( int i = 0; i < _waveformTotalBuffers; i++){
+      
+      // Take a snapshot of each buffer through the audio file to form the waveform
+      AudioBufferList *bufferList = [EZAudioUtilities audioBufferListWithNumberOfFrames:_waveformFrameRate
+                                                              numberOfChannels:_clientFormat.mChannelsPerFrame
+                                                                   interleaved:YES];
+      UInt32 bufferSize;
+      BOOL eof;
+      
+      // Read in the specified number of frames
+      [EZAudioUtilities checkResult:ExtAudioFileRead(_audioFile,
+                                            &_waveformFrameRate,
+                                            bufferList)
+                 operation:"Failed to read audio data from audio file"];
+      bufferSize = bufferList->mBuffers[0].mDataByteSize/sizeof(float);
+      bufferSize = MAX(1, bufferSize);
+      eof = _waveformFrameRate == 0;
+      _frameIndex += _waveformFrameRate;
+      
+      // Calculate RMS of each buffer
+      float rms = [EZAudioUtilities RMS:bufferList->mBuffers[0].mData
+                        length:bufferSize];
+      _waveformData[i] = rms;
+      
+      // Since we malloc'ed, we should cleanup
+      [EZAudioUtilities freeBufferList:bufferList];
+      
     }
-    return waveformData;
-}
-
-//------------------------------------------------------------------------------
-
-- (void)getWaveformDataWithCompletionBlock:(EZAudioWaveformDataCompletionBlock)waveformDataCompletionBlock
-{
-    [self getWaveformDataWithNumberOfPoints:EZAudioFileWaveformDefaultResolution
-                                 completion:waveformDataCompletionBlock];
-}
-
-//------------------------------------------------------------------------------
-
-- (void)getWaveformDataWithNumberOfPoints:(UInt32)numberOfPoints
-                               completion:(EZAudioWaveformDataCompletionBlock)completion
-{
-    if (!completion)
-    {
-        return;
-    }
-
-    // async get waveform data
-    __weak EZAudioFile *weakSelf = self;
-    dispatch_async(self.waveformQueue, ^{
-        EZAudioFloatData *waveformData = [weakSelf getWaveformDataWithNumberOfPoints:numberOfPoints];
-        dispatch_async(dispatch_get_main_queue(), ^{
-            completion(waveformData.buffers, waveformData.bufferSize);
-        });
+    
+    // Seek the audio file back to the beginning
+    [EZAudioUtilities checkResult:ExtAudioFileSeek(_audioFile,currentFramePosition)
+               operation:"Failed to seek frame position within audio file"];
+    _frameIndex = currentFramePosition;
+    
+    // Once we're done send off the waveform data
+    dispatch_async(dispatch_get_main_queue(), ^{
+      waveformDataCompletionBlock( _waveformData, _waveformTotalBuffers);
     });
+
+  });
+  
 }
 
-//------------------------------------------------------------------------------
-
-- (AudioStreamBasicDescription)clientFormat
-{
-    return self.info->clientFormat;
+-(AudioStreamBasicDescription)clientFormat {
+  return _clientFormat;
 }
 
-//------------------------------------------------------------------------------
-
-- (NSTimeInterval)currentTime
-{
-    return [EZAudioUtilities MAP:(float)[self frameIndex]
-                         leftMin:0.0f
-                         leftMax:(float)[self totalFrames]
-                        rightMin:0.0f
-                        rightMax:[self duration]];
+-(AudioStreamBasicDescription)fileFormat {
+  return _fileFormat;
 }
 
-//------------------------------------------------------------------------------
-
-- (NSTimeInterval)duration
-{
-    return self.info->duration;
+-(SInt64)frameIndex {
+  return _frameIndex;
 }
 
-//------------------------------------------------------------------------------
-
-- (AudioStreamBasicDescription)fileFormat
+-(NSDictionary *)metadata
 {
-    return self.info->fileFormat;
-}
-
-//------------------------------------------------------------------------------
-
-- (NSString *)formattedCurrentTime
-{
-    return [EZAudioUtilities displayTimeStringFromSeconds:[self currentTime]];
-}
-
-//------------------------------------------------------------------------------
-
-- (NSString *)formattedDuration
-{
-    return [EZAudioUtilities displayTimeStringFromSeconds:[self duration]];
-}
-
-//------------------------------------------------------------------------------
-
-- (SInt64)frameIndex
-{
-    SInt64 frameIndex;
-    [EZAudioUtilities checkResult:ExtAudioFileTell(self.info->extAudioFileRef, &frameIndex)
-                        operation:"Failed to get frame index"];
-    return frameIndex;
-}
-
-//------------------------------------------------------------------------------
-
-- (NSDictionary *)metadata
-{
-    // get size of metadata property (dictionary)
-    UInt32          propSize = sizeof(self.info->audioFileID);
+    AudioFileID audioFileID;
+    UInt32 propSize = sizeof(audioFileID);
+    [EZAudioUtilities checkResult:ExtAudioFileGetProperty(_audioFile,
+                                                 kExtAudioFileProperty_AudioFile,
+                                                 &propSize,
+                                                 &audioFileID)
+               operation:"Failed to get audio file id"];
+    
     CFDictionaryRef metadata;
-    UInt32          writable;
-    [EZAudioUtilities checkResult:AudioFileGetPropertyInfo(self.info->audioFileID,
-                                                           kAudioFilePropertyInfoDictionary,
-                                                           &propSize,
-                                                           &writable)
-                        operation:"Failed to get the size of the metadata dictionary"];
+    UInt32 isWritable;
+    [EZAudioUtilities checkResult:AudioFileGetPropertyInfo(audioFileID,
+                                                  kAudioFilePropertyInfoDictionary,
+                                                  &propSize,
+                                                  &isWritable)
+               operation:"Failed to get the size of the metadata dictionary"];
     
-    // pull metadata
-    [EZAudioUtilities checkResult:AudioFileGetProperty(self.info->audioFileID,
-                                                       kAudioFilePropertyInfoDictionary,
-                                                       &propSize,
-                                                       &metadata)
-                        operation:"Failed to get metadata dictionary"];
+    [EZAudioUtilities checkResult:AudioFileGetProperty(audioFileID,
+                                              kAudioFilePropertyInfoDictionary,
+                                              &propSize,
+                                              &metadata)
+               operation:"Failed to get metadata dictionary"];
     
-    // cast to NSDictionary
-    return (__bridge NSDictionary*)metadata;
+    return (__bridge NSDictionary *)metadata;
 }
 
-//------------------------------------------------------------------------------
-
-- (NSTimeInterval)totalDuration
-{
-    return self.info->duration;
+-(Float32)totalDuration {
+  return _totalDuration;
 }
 
-//------------------------------------------------------------------------------
-
-- (SInt64)totalClientFrames
-{
-    SInt64 totalFrames = [self totalFrames];
-    AudioStreamBasicDescription clientFormat = self.info->clientFormat;
-    AudioStreamBasicDescription fileFormat = self.info->fileFormat;
-    BOOL sameSampleRate = clientFormat.mSampleRate == fileFormat.mSampleRate;
-    if (!sameSampleRate)
-    {
-        totalFrames = self.info->duration * clientFormat.mSampleRate;
-    }
-    return totalFrames;
+-(SInt64)totalFrames {
+  return _totalFrames;
 }
 
-//------------------------------------------------------------------------------
-
-- (SInt64)totalFrames
-{
-    return self.info->frames;
+-(NSURL *)url {
+  return (__bridge NSURL*)_sourceURL;
 }
 
-//------------------------------------------------------------------------------
-
-- (NSURL *)url
-{
-  return (__bridge NSURL*)self.info->sourceURL;
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - Setters
-//------------------------------------------------------------------------------
-
-- (void)setClientFormat:(AudioStreamBasicDescription)clientFormat
-{
-    //
-    // Clear any float data currently cached
-    //
-    if (self.floatData)
-    {
-        self.floatData = nil;
+-(void)setWaveformResolution:(UInt32)waveformResolution {
+  if (_waveformResolution != waveformResolution){
+    _waveformResolution = waveformResolution;
+    if (_waveformData){
+      free(_waveformData);
+      _waveformData = NULL;
     }
-    
-    //
-    // Client format can only be linear PCM!
-    //
-    NSAssert([EZAudioUtilities isLinearPCM:clientFormat], @"Client format must be linear PCM");
-    
-    //
-    // Store the client format
-    //
-    self.info->clientFormat = clientFormat;
-    
-    //
-    // Set the client format on the ExtAudioFileRef
-    //
-    [EZAudioUtilities checkResult:ExtAudioFileSetProperty(self.info->extAudioFileRef,
-                                                          kExtAudioFileProperty_ClientDataFormat,
-                                                          sizeof(clientFormat),
-                                                          &clientFormat)
-                        operation:"Couldn't set client data format on file"];
-    
-    //
-    // Create a new float converter using the client format as the input format
-    //
-    self.floatConverter = [EZAudioFloatConverter converterWithInputFormat:clientFormat];
-    
-    //
-    // Determine how big our float buffers need to be to hold a buffer of float
-    // data for the audio received callback.
-    //
-    UInt32 maxPacketSize;
-    UInt32 propSize = sizeof(maxPacketSize);
-    [EZAudioUtilities checkResult:ExtAudioFileGetProperty(self.info->extAudioFileRef,
-                                                          kExtAudioFileProperty_ClientMaxPacketSize,
-                                                          &propSize,
-                                                          &maxPacketSize)
-                        operation:"Failed to get max packet size"];
-    
-    self.floatData = [EZAudioUtilities floatBuffersWithNumberOfFrames:1024
-                                                     numberOfChannels:self.clientFormat.mChannelsPerFrame];
+  }
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setCurrentTime:(NSTimeInterval)currentTime
-{
-    NSAssert(currentTime < [self duration], @"Invalid seek operation, expected current time to be less than duration");
-    SInt64 frame = [EZAudioUtilities MAP:currentTime
-                                 leftMin:0.0f
-                                 leftMax:[self duration]
-                                rightMin:0.0f
-                                rightMax:[self totalFrames]];
-    [self seekToFrame:frame];
+#pragma mark - Helpers
+-(UInt32)minBuffersWithFrameRate:(UInt32)frameRate {
+  frameRate = frameRate > 0 ? frameRate : 1;
+  UInt32 val = (UInt32) _totalFrames / frameRate + 1;
+  return MAX(1, val);
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Description
-//------------------------------------------------------------------------------
-
-- (NSString *)description
-{
-    return [NSString stringWithFormat:@"%@ {\n"
-                                       "    url: %@,\n"
-                                       "    duration: %f,\n"
-                                       "    totalFrames: %lld,\n"
-                                       "    metadata: %@,\n"
-                                       "    fileFormat: { %@ },\n"
-                                       "    clientFormat: { %@ } \n"
-                                       "}",
-            [super description],
-            [self url],
-            [self duration],
-            [self totalFrames],
-            [self metadata],
-            [EZAudioUtilities stringForAudioStreamBasicDescription:[self fileFormat]],
-            [EZAudioUtilities stringForAudioStreamBasicDescription:[self clientFormat]]];
+-(UInt32)recommendedDrawingFrameRate {
+  UInt32 val = 1;
+  if(_waveformResolution > 0){
+    val = (UInt32) _totalFrames / _waveformResolution;
+    if(val > 1)
+      --val;
+  }
+  return MAX(1, val);
 }
 
-//------------------------------------------------------------------------------
+#pragma mark - Cleanup
+-(void)dealloc {
+  if (_waveformData){
+    free(_waveformData);
+    _waveformData = NULL;
+  }
+//  if (_floatBuffers){
+//    free(_floatBuffers);
+//    _floatBuffers = NULL;
+//  }
+  _frameIndex = 0;
+  _waveformFrameRate = 0;
+  _waveformTotalBuffers = 0;
+  if (_audioFile){
+    [EZAudioUtilities checkResult:ExtAudioFileDispose(_audioFile)
+               operation:"Failed to dispose of audio file"];
+  }
+}
 
 @end

EZAudio/EZAudioFloatConverter.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 6/23/15.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

EZAudio/EZAudioFloatConverter.m

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 6/23/15.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -60,7 +60,7 @@ OSStatus EZAudioFloatConverterCallback(AudioConverterRef             inAudioConv
     AudioBufferList *sourceBuffer = (AudioBufferList *)inUserData;
     memcpy(ioData,
            sourceBuffer,
-           sizeof(AudioBufferList) + (sourceBuffer->mNumberBuffers - 1) * sizeof(AudioBuffer));
+           sizeof(AudioBufferList) + (sourceBuffer->mNumberBuffers - 1)*sizeof(AudioBuffer));
     return noErr;
 }
 

EZAudio/EZAudioFloatData.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 6/23/15.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

EZAudio/EZAudioFloatData.m

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 6/23/15.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

EZAudio/EZAudioPlayer.h

@@ -28,60 +28,41 @@
 #import "EZAudioFile.h"
 #import "EZOutput.h"
 
+#if TARGET_OS_IPHONE
+  #import <AVFoundation/AVFoundation.h>
+#elif TARGET_OS_MAC
+#endif
+
 @class EZAudioPlayer;
 
-//------------------------------------------------------------------------------
-#pragma mark - Notifications
-//------------------------------------------------------------------------------
 
 /**
- Notification that occurs whenever the EZAudioPlayer changes its `audioFile` property. Check the new value using the EZAudioPlayer's `audioFile` property.
- */
-FOUNDATION_EXPORT NSString * const EZAudioPlayerDidChangeAudioFileNotification;
-
-/**
- Notification that occurs whenever the EZAudioPlayer changes its `device` property. Check the new value using the EZAudioPlayer's `device` property.
- */
-FOUNDATION_EXPORT NSString * const EZAudioPlayerDidChangeOutputDeviceNotification;
-
-/**
- Notification that occurs whenever the EZAudioPlayer changes its `output` component's `pan` property. Check the new value using the EZAudioPlayer's `pan` property.
- */
-FOUNDATION_EXPORT NSString * const EZAudioPlayerDidChangePanNotification;
-
-/**
- Notification that occurs whenever the EZAudioPlayer changes its `output` component's play state. Check the new value using the EZAudioPlayer's `isPlaying` property.
- */
-FOUNDATION_EXPORT NSString * const EZAudioPlayerDidChangePlayStateNotification;
-
-/**
- Notification that occurs whenever the EZAudioPlayer changes its `output` component's `volume` property. Check the new value using the EZAudioPlayer's `volume` property.
- */
-FOUNDATION_EXPORT NSString * const EZAudioPlayerDidChangeVolumeNotification;
-
-/**
- Notification that occurs whenever the EZAudioPlayer has reached the end of a file and its `shouldLoop` property has been set to NO.
- */
-FOUNDATION_EXPORT NSString * const EZAudioPlayerDidReachEndOfFileNotification;
-
-/**
- Notification that occurs whenever the EZAudioPlayer performs a seek via the `seekToFrame` method or `setCurrentTime:` property setter. Check the new `currentTime` or `frameIndex` value using the EZAudioPlayer's `currentTime` or `frameIndex` property, respectively.
- */
-FOUNDATION_EXPORT NSString * const EZAudioPlayerDidSeekNotification;
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlayerDelegate
-//------------------------------------------------------------------------------
-
-/**
- The EZAudioPlayerDelegate provides event callbacks for the EZAudioPlayer. Since 0.5.0 the EZAudioPlayerDelegate provides a smaller set of delegate methods in favor of notifications to allow multiple receivers of the EZAudioPlayer event callbacks since only one player is typically used in an application. Specifically, these methods are provided for high frequency callbacks that wrap the EZAudioPlayer's internal EZAudioFile and EZOutput instances.
+ The EZAudioPlayerDelegate provides event callbacks for the EZAudioPlayer. These type of events are triggered by changes in the EZAudioPlayer's state and allow someone implementing the EZAudioPlayer to more easily update their user interface. Events are triggered anytime the EZAudioPlayer resumes/pauses playback, reaches the end of the file, reads audio data and converts it to float data visualizations (using the EZAudioFile), and updates its cursor position within the audio file during playback (use this for the play position on a slider on the user interface).
  @warning These callbacks don't necessarily occur on the main thread so make sure you wrap any UI code in a GCD block like: dispatch_async(dispatch_get_main_queue(), ^{ // Update UI });
  */
 @protocol EZAudioPlayerDelegate <NSObject>
 
 @optional
+/**
+ Triggered by the EZAudioPlayer when the playback has been resumed or started.
+ @param audioPlayer The instance of the EZAudioPlayer that triggered the event
+ @param audioFile   The instance of the EZAudioFile that the event was triggered from
+ */
+-(void)audioPlayer:(EZAudioPlayer*)audioPlayer didResumePlaybackOnAudioFile:(EZAudioFile*)audioFile;
 
-//------------------------------------------------------------------------------
+/**
+ Triggered by the EZAudioPlayer when the playback has been paused.
+ @param audioPlayer The instance of the EZAudioPlayer that triggered the event
+ @param audioFile   The instance of the EZAudioFile that the event was triggered from
+ */
+-(void)audioPlayer:(EZAudioPlayer*)audioPlayer didPausePlaybackOnAudioFile:(EZAudioFile*)audioFile;
+
+/**
+ Triggered by the EZAudioPlayer when the output has reached the end of the EZAudioFile it's playing. If the EZAudioPlayer has its `shouldLoop` property set to true this will trigger, but playback will continue to loop once its hit the end of the audio file.
+ @param audioPlayer The instance of the EZAudioPlayer that triggered the event
+ @param audioFile   The instance of the EZAudioFile that the event was triggered from
+ */
+-(void)audioPlayer:(EZAudioPlayer*)audioPlayer reachedEndOfAudioFile:(EZAudioFile*)audioFile;
 
 /**
  Triggered by the EZAudioPlayer's internal EZAudioFile's EZAudioFileDelegate callback and notifies the delegate of the read audio data as a float array instead of a buffer list. Common use case of this would be to visualize the float data using an audio plot or audio data dependent OpenGL sketch.
@@ -91,13 +72,11 @@ FOUNDATION_EXPORT NSString * const EZAudioPlayerDidSeekNotification;
  @param numberOfChannels The number of channels. 2 for stereo, 1 for mono.
  @param audioFile   The instance of the EZAudioFile that the event was triggered from
  */
-- (void)  audioPlayer:(EZAudioPlayer *)audioPlayer
-          playedAudio:(float **)buffer
+-(void)   audioPlayer:(EZAudioPlayer*)audioPlayer
+            readAudio:(float**)buffer
        withBufferSize:(UInt32)bufferSize
  withNumberOfChannels:(UInt32)numberOfChannels
-          inAudioFile:(EZAudioFile *)audioFile;;
-
-//------------------------------------------------------------------------------
+          inAudioFile:(EZAudioFile*)audioFile;;
 
 /**
  Triggered by EZAudioPlayer's internal EZAudioFile's EZAudioFileDelegate callback and notifies the delegate of the current playback position. The framePosition provides the current frame position and can be calculated against the EZAudioPlayer's total frames using the `totalFrames` function from the EZAudioPlayer.
@@ -105,36 +84,18 @@ FOUNDATION_EXPORT NSString * const EZAudioPlayerDidSeekNotification;
  @param framePosition The new frame index as a 64-bit signed integer
  @param audioFile   The instance of the EZAudioFile that the event was triggered from
  */
-- (void)audioPlayer:(EZAudioPlayer *)audioPlayer
-    updatedPosition:(SInt64)framePosition
-        inAudioFile:(EZAudioFile *)audioFile;
-
-
-/**
- Triggered by EZAudioPlayer's internal EZAudioFile's EZAudioFileDelegate callback and notifies the delegate that the end of the file has been reached. 
- @param audioPlayer The instance of the EZAudioPlayer that triggered the event
- @param audioFile   The instance of the EZAudioFile that the event was triggered from
- */
-- (void)audioPlayer:(EZAudioPlayer *)audioPlayer
-reachedEndOfAudioFile:(EZAudioFile *)audioFile;
+-(void)audioPlayer:(EZAudioPlayer*)audioPlayer
+   updatedPosition:(SInt64)framePosition
+       inAudioFile:(EZAudioFile*)audioFile;
 
 @end
 
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlayer
-//------------------------------------------------------------------------------
-
 /**
- The EZAudioPlayer provides an interface that combines the EZAudioFile and EZOutput to play local audio files. This class acts as the master delegate (the EZAudioFileDelegate) over whatever EZAudioFile instance, the `audioFile` property, it is using for playback as well as the EZOutputDelegate and EZOutputDataSource over whatever EZOutput instance is set as the `output`. Classes that want to get the EZAudioFileDelegate callbacks should implement the EZAudioPlayer's EZAudioPlayerDelegate on the EZAudioPlayer instance. Since 0.5.0 the EZAudioPlayer offers notifications over the usual delegate methods to allow multiple receivers to get the EZAudioPlayer's state changes since one player will typically be used in one application. The EZAudioPlayerDelegate, the `delegate`, provides callbacks for high frequency methods that simply wrap the EZAudioFileDelegate and EZOutputDelegate callbacks for providing the audio buffer played as well as the position updating (you will typically have one scrub bar in an application).
+ The EZAudioPlayer acts as the master delegate (the EZAudioFileDelegate) over whatever EZAudioFile it is using for playback. Classes that want to get the EZAudioFileDelegate callbacks should implement the EZAudioPlayer's EZAudioPlayerDelegate on the EZAudioPlayer instance.
  */
-@interface EZAudioPlayer : NSObject <EZAudioFileDelegate,
-                                     EZOutputDataSource,
-                                     EZOutputDelegate>
+@interface EZAudioPlayer : NSObject
 
-//------------------------------------------------------------------------------
 #pragma mark - Properties
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Properties
 ///-----------------------------------------------------------
@@ -142,19 +103,14 @@ reachedEndOfAudioFile:(EZAudioFile *)audioFile;
 /**
  The EZAudioPlayerDelegate that will handle the audio player callbacks
  */
-@property (nonatomic, weak) id<EZAudioPlayerDelegate> delegate;
-
-//------------------------------------------------------------------------------
+@property (nonatomic,assign) id<EZAudioPlayerDelegate> audioPlayerDelegate;
 
 /**
  A BOOL indicating whether the player should loop the file
  */
-@property (nonatomic, assign) BOOL shouldLoop;
+@property (nonatomic,assign) BOOL shouldLoop;
 
-//------------------------------------------------------------------------------
 #pragma mark - Initializers
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Initializers
 ///-----------------------------------------------------------
@@ -164,114 +120,72 @@ reachedEndOfAudioFile:(EZAudioFile *)audioFile;
  @param audioFile The instance of the EZAudioFile to use for initializing the EZAudioPlayer
  @return The newly created instance of the EZAudioPlayer
  */
-- (instancetype)initWithAudioFile:(EZAudioFile *)audioFile;
-
-//------------------------------------------------------------------------------
+-(EZAudioPlayer*)initWithEZAudioFile:(EZAudioFile*)audioFile;
 
 /**
  Initializes the EZAudioPlayer with an EZAudioFile instance and provides a way to assign the EZAudioPlayerDelegate on instantiation. This does not use the EZAudioFile by reference, but instead creates a separate EZAudioFile instance with the same file at the given file path provided by the internal NSURL to use for internal seeking so it doesn't cause any locking between the caller's instance of the EZAudioFile.
  @param audioFile The instance of the EZAudioFile to use for initializing the EZAudioPlayer
- @param delegate The receiver that will act as the EZAudioPlayerDelegate. Set to nil if it should have no delegate or use the initWithAudioFile: function instead.
+ @param audioPlayerDelegate The receiver that will act as the EZAudioPlayerDelegate. Set to nil if it should have no delegate or use the initWithEZAudioFile: function instead.
  @return The newly created instance of the EZAudioPlayer
  */
-- (instancetype)initWithAudioFile:(EZAudioFile *)audioFile
-                         delegate:(id<EZAudioPlayerDelegate>)delegate;
-
-//------------------------------------------------------------------------------
-
-/**
- Initializes the EZAudioPlayer with an EZAudioPlayerDelegate.
- @param delegate The receiver that will act as the EZAudioPlayerDelegate. Set to nil if it should have no delegate or use the initWithAudioFile: function instead.
- @return The newly created instance of the EZAudioPlayer
- */
-- (instancetype)initWithDelegate:(id<EZAudioPlayerDelegate>)delegate;
-
-//------------------------------------------------------------------------------
+-(EZAudioPlayer*)initWithEZAudioFile:(EZAudioFile*)audioFile
+                        withDelegate:(id<EZAudioPlayerDelegate>)audioPlayerDelegate;
 
 /**
  Initializes the EZAudioPlayer with an NSURL instance representing the file path of the audio file.
  @param url The NSURL instance representing the file path of the audio file.
  @return The newly created instance of the EZAudioPlayer
  */
-- (instancetype)initWithURL:(NSURL*)url;
-
-//------------------------------------------------------------------------------
+-(EZAudioPlayer*)initWithURL:(NSURL*)url;
 
 /**
  Initializes the EZAudioPlayer with an NSURL instance representing the file path of the audio file and a caller to assign as the EZAudioPlayerDelegate on instantiation.
  @param url The NSURL instance representing the file path of the audio file.
- @param delegate The receiver that will act as the EZAudioPlayerDelegate. Set to nil if it should have no delegate or use the initWithAudioFile: function instead.
+ @param audioPlayerDelegate The receiver that will act as the EZAudioPlayerDelegate. Set to nil if it should have no delegate or use the initWithEZAudioFile: function instead.
  @return The newly created instance of the EZAudioPlayer
  */
-- (instancetype)initWithURL:(NSURL*)url
-                   delegate:(id<EZAudioPlayerDelegate>)delegate;
+-(EZAudioPlayer*)initWithURL:(NSURL*)url
+                withDelegate:(id<EZAudioPlayerDelegate>)audioPlayerDelegate;
+
 
-//------------------------------------------------------------------------------
 #pragma mark - Class Initializers
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Class Initializers
 ///-----------------------------------------------------------
 
 /**
- Class initializer that creates a default EZAudioPlayer.
- @return The newly created instance of the EZAudioPlayer
- */
-+ (instancetype)audioPlayer;
-
-//------------------------------------------------------------------------------
-
-/**
- Class initializer that creates the EZAudioPlayer with an EZAudioFile instance. This does not use the EZAudioFile by reference, but instead creates a separate EZAudioFile instance with the same file at the given file path provided by the internal NSURL to use for internal seeking so it doesn't cause any locking between the caller's instance of the EZAudioFile.
+ Class initializer that initializes the EZAudioPlayer with an EZAudioFile instance. This does not use the EZAudioFile by reference, but instead creates a separate EZAudioFile instance with the same file at the given file path provided by the internal NSURL to use for internal seeking so it doesn't cause any locking between the caller's instance of the EZAudioFile.
  @param audioFile The instance of the EZAudioFile to use for initializing the EZAudioPlayer
  @return The newly created instance of the EZAudioPlayer
  */
-+ (instancetype)audioPlayerWithAudioFile:(EZAudioFile *)audioFile;
-
-//------------------------------------------------------------------------------
++(EZAudioPlayer*)audioPlayerWithEZAudioFile:(EZAudioFile*)audioFile;
 
 /**
- Class initializer that creates the EZAudioPlayer with an EZAudioFile instance and provides a way to assign the EZAudioPlayerDelegate on instantiation. This does not use the EZAudioFile by reference, but instead creates a separate EZAudioFile instance with the same file at the given file path provided by the internal NSURL to use for internal seeking so it doesn't cause any locking between the caller's instance of the EZAudioFile.
+ Class initializer that initializes the EZAudioPlayer with an EZAudioFile instance and provides a way to assign the EZAudioPlayerDelegate on instantiation. This does not use the EZAudioFile by reference, but instead creates a separate EZAudioFile instance with the same file at the given file path provided by the internal NSURL to use for internal seeking so it doesn't cause any locking between the caller's instance of the EZAudioFile.
  @param audioFile The instance of the EZAudioFile to use for initializing the EZAudioPlayer
- @param delegate The receiver that will act as the EZAudioPlayerDelegate. Set to nil if it should have no delegate or use the audioPlayerWithAudioFile: function instead.
+ @param audioPlayerDelegate The receiver that will act as the EZAudioPlayerDelegate. Set to nil if it should have no delegate or use the audioPlayerWithEZAudioFile: function instead.
  @return The newly created instance of the EZAudioPlayer
  */
-+ (instancetype)audioPlayerWithAudioFile:(EZAudioFile *)audioFile
-                                delegate:(id<EZAudioPlayerDelegate>)delegate;
-
-//------------------------------------------------------------------------------
++(EZAudioPlayer*)audioPlayerWithEZAudioFile:(EZAudioFile*)audioFile
+                               withDelegate:(id<EZAudioPlayerDelegate>)audioPlayerDelegate;
 
 /**
- Class initializer that creates a default EZAudioPlayer with an EZAudioPlayerDelegate..
- @return The newly created instance of the EZAudioPlayer
- */
-+ (instancetype)audioPlayerWithDelegate:(id<EZAudioPlayerDelegate>)delegate;
-
-//------------------------------------------------------------------------------
-
-/**
- Class initializer that creates the EZAudioPlayer with an NSURL instance representing the file path of the audio file.
+ Class initializer that initializes the EZAudioPlayer with an NSURL instance representing the file path of the audio file.
  @param url The NSURL instance representing the file path of the audio file.
  @return The newly created instance of the EZAudioPlayer
  */
-+ (instancetype)audioPlayerWithURL:(NSURL*)url;
-
-//------------------------------------------------------------------------------
++(EZAudioPlayer*)audioPlayerWithURL:(NSURL*)url;
 
 /**
- Class initializer that creates the EZAudioPlayer with an NSURL instance representing the file path of the audio file and a caller to assign as the EZAudioPlayerDelegate on instantiation.
+ Class initializer that initializes the EZAudioPlayer with an NSURL instance representing the file path of the audio file and a caller to assign as the EZAudioPlayerDelegate on instantiation.
  @param url The NSURL instance representing the file path of the audio file.
- @param delegate The receiver that will act as the EZAudioPlayerDelegate. Set to nil if it should have no delegate or use the audioPlayerWithURL: function instead.
+ @param audioPlayerDelegate The receiver that will act as the EZAudioPlayerDelegate. Set to nil if it should have no delegate or use the audioPlayerWithURL: function instead.
  @return The newly created instance of the EZAudioPlayer
  */
-+ (instancetype)audioPlayerWithURL:(NSURL*)url
-                          delegate:(id<EZAudioPlayerDelegate>)delegate;
++(EZAudioPlayer*)audioPlayerWithURL:(NSURL*)url
+                       withDelegate:(id<EZAudioPlayerDelegate>)audioPlayerDelegate;
 
-//------------------------------------------------------------------------------
 #pragma mark - Singleton
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Shared Instance
 ///-----------------------------------------------------------
@@ -280,144 +194,108 @@ reachedEndOfAudioFile:(EZAudioFile *)audioFile;
  The shared instance (singleton) of the audio player. Most applications will only have one instance of the EZAudioPlayer that can be reused with multiple different audio files.
  *  @return The shared instance of the EZAudioPlayer.
  */
-+ (instancetype)sharedAudioPlayer;
-
-//------------------------------------------------------------------------------
-#pragma mark - Properties
-//------------------------------------------------------------------------------
++(EZAudioPlayer*)sharedAudioPlayer;
 
+#pragma mark - Getters
 ///-----------------------------------------------------------
-/// @name Properties
+/// @name Getting The Audio Player's Properties
 ///-----------------------------------------------------------
 
 /**
- Provides the EZAudioFile instance that is being used as the datasource for playback. When set it creates a copy of the EZAudioFile provided for internal use. This does not use the EZAudioFile by reference, but instead creates a copy of the EZAudioFile instance provided.
+ Provides the EZAudioFile instance that is being used as the datasource for playback.
+ @return The EZAudioFile instance that is currently being used for playback.
  */
-@property (nonatomic, readwrite, copy) EZAudioFile *audioFile;
-
-//------------------------------------------------------------------------------
+-(EZAudioFile*)audioFile;
 
 /**
- Provides the current offset in the audio file as an NSTimeInterval (i.e. in seconds).  When setting this it will determine the correct frame offset and perform a `seekToFrame` to the new time offset.
- @warning Make sure the new current time offset is less than the `duration` or you will receive an invalid seek assertion.
+ Provides the current time (a.k.a. the seek position) in seconds within the audio file that's being used for playback. This can be helpful when displaying the audio player's current time over duration.
+ @return A float representing the current time within the audio file used for playback.
  */
-@property (nonatomic, readwrite) NSTimeInterval currentTime;
-
-//------------------------------------------------------------------------------
+-(float)currentTime;
 
 /**
- The EZAudioDevice instance that is being used by the `output`. Similarly, setting this just sets the `device` property of the `output`.
+ Provides a flag indicating whether the EZAudioPlayer has reached the end of the audio file used for playback.
+ @return A BOOL indicating whether or not the EZAudioPlayer has reached the end of the file it is using for playback.
  */
-@property (readwrite) EZAudioDevice *device;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the duration of the audio file in seconds.
- */
-@property (readonly) NSTimeInterval duration;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the current time as an NSString with the time format MM:SS.
- */
-@property (readonly) NSString *formattedCurrentTime;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the duration as an NSString with the time format MM:SS.
- */
-@property (readonly) NSString *formattedDuration;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the EZOutput that is being used to handle the actual playback of the audio data. This property is also settable, but note that the EZAudioPlayer will become the output's EZOutputDataSource and EZOutputDelegate. To listen for the EZOutput's delegate methods your view should implement the EZAudioPlayerDelegate and set itself as the EZAudioPlayer's `delegate`.
- */
-@property (nonatomic, strong, readwrite) EZOutput *output;
-
-//------------------------------------------------------------------------------
+-(BOOL)endOfFile;
 
 /**
  Provides the frame index (a.k.a the seek positon) within the audio file being used for playback. This can be helpful when seeking through the audio file.
  @return An SInt64 representing the current frame index within the audio file used for playback.
  */
-@property (readonly) SInt64 frameIndex;
-
-//------------------------------------------------------------------------------
+-(SInt64)frameIndex;
 
 /**
  Provides a flag indicating whether the EZAudioPlayer is currently playing back any audio.
  @return A BOOL indicating whether or not the EZAudioPlayer is performing playback,
  */
-@property (readonly) BOOL isPlaying;
-
-//------------------------------------------------------------------------------
+-(BOOL)isPlaying;
 
 /**
- Provides the current pan from the audio player's internal `output` component. Setting the pan adjusts the direction of the audio signal from left (0) to right (1). Default is 0.5 (middle).
+ Provides the EZOutput instance that is being used to provide playback to the system output.
+ @return The EZOutput instance that is currently being used for output playback.
  */
-@property (nonatomic, assign) float pan;
+-(EZOutput*)output;
 
-//------------------------------------------------------------------------------
+/**
+ Provides the total duration of the current audio file being used for playback (in seconds).
+ @return A float representing the total duration of the current audio file being used for playback in seconds.
+ */
+-(float)totalDuration;
 
 /**
  Provides the total amount of frames in the current audio file being used for playback.
  @return A SInt64 representing the total amount of frames in the current audio file being used for playback.
  */
-@property (readonly) SInt64 totalFrames;
-
-//------------------------------------------------------------------------------
+-(SInt64)totalFrames;
 
 /**
  Provides the file path that's currently being used by the player for playback.
  @return  The NSURL representing the file path of the audio file being used for playback.
  */
-@property (nonatomic, copy, readonly) NSURL *url;
-
-//------------------------------------------------------------------------------
-
-/**
-  Provides the current volume from the audio player's internal `output` component. Setting the volume adjusts the gain of the output between 0 and 1. Default is 1.
- */
-@property (nonatomic, assign) float volume;
-
-//------------------------------------------------------------------------------
-#pragma mark - Actions
-//------------------------------------------------------------------------------
+-(NSURL*)url;
 
+#pragma mark - Setters
 ///-----------------------------------------------------------
-/// @name Controlling Playback
+/// @name Setting The File/Output
 ///-----------------------------------------------------------
 
 /**
- Starts playback.
+ Sets the EZAudioFile to use for playback. This does not use the EZAudioFile by reference, but instead creates a separate EZAudioFile instance with the same file at the given file path provided by the internal NSURL to use for internal seeking so it doesn't cause any locking between the caller's instance of the EZAudioFile.
+ @param audioFile The new EZAudioFile instance that should be used for playback
  */
-- (void)play;
-
-//------------------------------------------------------------------------------
+-(void)setAudioFile:(EZAudioFile*)audioFile;
 
 /**
- Loads an EZAudioFile and immediately starts playing it.
- @param audioFile An EZAudioFile to use for immediate playback.
+ Sets the EZOutput to route playback. By default this uses the [EZOutput sharedOutput] singleton.
+ @param output The new EZOutput instance that should be used for playback
  */
-- (void)playAudioFile:(EZAudioFile *)audioFile;
+-(void)setOutput:(EZOutput*)output;
 
-//------------------------------------------------------------------------------
+#pragma mark - Methods
+///-----------------------------------------------------------
+/// @name Play/Pause/Seeking the Player
+///-----------------------------------------------------------
+
+/**
+ Starts or resumes playback.
+ */
+-(void)play;
 
 /**
  Pauses playback.
  */
-- (void)pause;
+-(void)pause;
 
-//------------------------------------------------------------------------------
+/**
+ Stops playback.
+ */
+-(void)stop;
 
 /**
  Seeks playback to a specified frame within the internal EZAudioFile. This will notify the EZAudioFileDelegate (if specified) with the audioPlayer:updatedPosition:inAudioFile: function.
  @param frame The new frame position to seek to as a SInt64.
  */
-- (void)seekToFrame:(SInt64)frame;
+-(void)seekToFrame:(SInt64)frame;
 
 @end

EZAudio/EZAudioPlayer.m

@@ -26,420 +26,272 @@
 #import "EZAudioPlayer.h"
 #import "EZAudioUtilities.h"
 
-//------------------------------------------------------------------------------
-#pragma mark - Notifications
-//------------------------------------------------------------------------------
-
-NSString * const EZAudioPlayerDidChangeAudioFileNotification = @"EZAudioPlayerDidChangeAudioFileNotification";
-NSString * const EZAudioPlayerDidChangeOutputDeviceNotification = @"EZAudioPlayerDidChangeOutputDeviceNotification";
-NSString * const EZAudioPlayerDidChangePanNotification = @"EZAudioPlayerDidChangePanNotification";
-NSString * const EZAudioPlayerDidChangePlayStateNotification = @"EZAudioPlayerDidChangePlayStateNotification";
-NSString * const EZAudioPlayerDidChangeVolumeNotification = @"EZAudioPlayerDidChangeVolumeNotification";
-NSString * const EZAudioPlayerDidReachEndOfFileNotification = @"EZAudioPlayerDidReachEndOfFileNotification";
-NSString * const EZAudioPlayerDidSeekNotification = @"EZAudioPlayerDidSeekNotification";
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlayer (Implementation)
-//------------------------------------------------------------------------------
+#if TARGET_OS_IPHONE
+#elif TARGET_OS_MAC
+#endif
+@interface EZAudioPlayer () <EZAudioFileDelegate,EZOutputDataSource>
+{
+  BOOL _eof;
+}
+@property (nonatomic,strong,setter=setAudioFile:) EZAudioFile *audioFile;
+@property (nonatomic,strong,setter=setOutput:)    EZOutput    *output;
+@end
 
 @implementation EZAudioPlayer
+@synthesize audioFile = _audioFile;
+@synthesize audioPlayerDelegate = _audioPlayerDelegate;
+@synthesize output = _output;
+@synthesize shouldLoop = _shouldLoop;
 
-//------------------------------------------------------------------------------
-#pragma mark - Class Methods
-//------------------------------------------------------------------------------
-
-+ (instancetype)audioPlayer
-{
-    return [[self alloc] init];
+#pragma mark - Initializers
+-(id)init {
+  self = [super init];
+  if(self){
+    [self _configureAudioPlayer];
+  }
+  return self;
 }
 
-//------------------------------------------------------------------------------
-
-+ (instancetype)audioPlayerWithDelegate:(id<EZAudioPlayerDelegate>)delegate
-{
-    return [[self alloc] initWithDelegate:delegate];
+-(EZAudioPlayer*)initWithEZAudioFile:(EZAudioFile *)audioFile {
+  return [self initWithEZAudioFile:audioFile withDelegate:nil];
 }
 
-//------------------------------------------------------------------------------
-
-+ (instancetype)audioPlayerWithAudioFile:(EZAudioFile *)audioFile
-{
-    return [[self alloc] initWithAudioFile:audioFile];
+-(EZAudioPlayer *)initWithEZAudioFile:(EZAudioFile *)audioFile
+                         withDelegate:(id<EZAudioPlayerDelegate>)audioPlayerDelegate {
+  self = [super init];
+  if(self){
+    // This should make a separate reference to the audio file
+    [self _configureAudioPlayer];
+    self.audioFile           = audioFile;
+    self.audioPlayerDelegate = audioPlayerDelegate;
+  }
+  return self;
 }
 
-//------------------------------------------------------------------------------
-
-+ (instancetype)audioPlayerWithAudioFile:(EZAudioFile *)audioFile
-                                   delegate:(id<EZAudioPlayerDelegate>)delegate
-{
-    return [[self alloc] initWithAudioFile:audioFile
-                                  delegate:delegate];
+-(EZAudioPlayer *)initWithURL:(NSURL *)url {
+  return [self initWithURL:url withDelegate:nil];
 }
 
-//------------------------------------------------------------------------------
-
-+ (instancetype)audioPlayerWithURL:(NSURL *)url
-{
-    return [[self alloc] initWithURL:url];
+-(EZAudioPlayer *)initWithURL:(NSURL *)url
+                 withDelegate:(id<EZAudioPlayerDelegate>)audioPlayerDelegate {
+  self = [super init];
+  if(self){
+    [self _configureAudioPlayer];
+    self.audioFile           = [EZAudioFile audioFileWithURL:url andDelegate:self];
+    self.audioPlayerDelegate = audioPlayerDelegate;
+  }
+  return self;
 }
 
-//------------------------------------------------------------------------------
-
-+ (instancetype)audioPlayerWithURL:(NSURL *)url
-                             delegate:(id<EZAudioPlayerDelegate>)delegate
-{
-    return [[self alloc] initWithURL:url delegate:delegate];
+#pragma mark - Class Initializers
++(EZAudioPlayer *)audioPlayerWithEZAudioFile:(EZAudioFile *)audioFile {
+  return [[EZAudioPlayer alloc] initWithEZAudioFile:audioFile];
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Initialization
-//------------------------------------------------------------------------------
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self)
-    {
-        [self setup];
-    }
-    return self;
++(EZAudioPlayer *)audioPlayerWithEZAudioFile:(EZAudioFile *)audioFile
+                                withDelegate:(id<EZAudioPlayerDelegate>)audioPlayerDelegate {
+  return [[EZAudioPlayer alloc] initWithEZAudioFile:audioFile
+                                       withDelegate:audioPlayerDelegate];
 }
 
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithDelegate:(id<EZAudioPlayerDelegate>)delegate
-{
-    self = [self init];
-    if (self)
-    {
-        self.delegate = delegate;
-    }
-    return self;
++(EZAudioPlayer *)audioPlayerWithURL:(NSURL *)url {
+  return [[EZAudioPlayer alloc] initWithURL:url];
 }
 
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithAudioFile:(EZAudioFile *)audioFile
-{
-    return [self initWithAudioFile:audioFile delegate:nil];
++(EZAudioPlayer *)audioPlayerWithURL:(NSURL *)url
+                        withDelegate:(id<EZAudioPlayerDelegate>)audioPlayerDelegate {
+  return [[EZAudioPlayer alloc] initWithURL:url
+                               withDelegate:audioPlayerDelegate];
 }
 
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithAudioFile:(EZAudioFile *)audioFile
-                            delegate:(id<EZAudioPlayerDelegate>)delegate
-{
-    self = [self initWithDelegate:delegate];
-    if (self)
-    {
-        self.audioFile = audioFile;
-    }
-    return self;
-}
-
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithURL:(NSURL *)url
-{
-    return [self initWithURL:url delegate:nil];
-}
-
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithURL:(NSURL *)url
-                      delegate:(id<EZAudioPlayerDelegate>)delegate
-{
-    self = [self initWithDelegate:delegate];
-    if (self)
-    {
-        self.audioFile = [EZAudioFile audioFileWithURL:url delegate:self];
-    }
-    return self;
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - Singleton
-//------------------------------------------------------------------------------
-
-+ (instancetype)sharedAudioPlayer
-{
-    static EZAudioPlayer *player;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        player = [[self alloc] init];
-    });
-    return player;
++(EZAudioPlayer *)sharedAudioPlayer {
+  static EZAudioPlayer *_sharedAudioPlayer = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    _sharedAudioPlayer = [[EZAudioPlayer alloc] init];
+  });
+  return _sharedAudioPlayer;
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Setup
-//------------------------------------------------------------------------------
-
-- (void)setup
-{
-    self.output = [EZOutput output];
+#pragma mark - Private Configuration
+-(void)_configureAudioPlayer {
+  
+  // Defaults
+  self.output = [EZOutput sharedOutput];
+  
+#if TARGET_OS_IPHONE
+  // Configure the AVSession
+  AVAudioSession *audioSession = [AVAudioSession sharedInstance];
+  NSError *err = NULL;
+  [audioSession setCategory:AVAudioSessionCategoryPlayAndRecord error:&err];
+  if (err){
+    NSLog(@"There was an error creating the audio session");
+  }
+  [audioSession overrideOutputAudioPort:AVAudioSessionPortOverrideSpeaker error:NULL];
+  if (err){
+    NSLog(@"There was an error sending the audio to the speakers");
+  }
+#elif TARGET_OS_MAC
+#endif
+  
 }
 
-//------------------------------------------------------------------------------
 #pragma mark - Getters
-//------------------------------------------------------------------------------
-
-- (NSTimeInterval)currentTime
-{
-    return [self.audioFile currentTime];
+-(EZAudioFile*)audioFile {
+  return _audioFile;
 }
 
-//------------------------------------------------------------------------------
-
-- (EZAudioDevice *)device
-{
-    return [self.output device];
+-(float)currentTime {
+  NSAssert(_audioFile,@"No audio file to perform the seek on, check that EZAudioFile is not nil");
+  return [EZAudioUtilities MAP:self.audioFile.frameIndex
+              leftMin:0
+              leftMax:self.audioFile.totalFrames
+             rightMin:0
+             rightMax:self.audioFile.totalDuration];
 }
 
-//------------------------------------------------------------------------------
-
-- (NSTimeInterval)duration
-{
-    return [self.audioFile duration];
+-(BOOL)endOfFile {
+  return _eof;
 }
 
-//------------------------------------------------------------------------------
-
-- (NSString *)formattedCurrentTime
-{
-    return [self.audioFile formattedCurrentTime];
+-(SInt64)frameIndex {
+  NSAssert(_audioFile,@"No audio file to perform the seek on, check that EZAudioFile is not nil");
+  return _audioFile.frameIndex;
 }
 
-//------------------------------------------------------------------------------
-
-- (NSString *)formattedDuration
-{
-    return [self.audioFile formattedDuration];
+-(BOOL)isPlaying {
+  return self.output.isPlaying;
 }
 
-//------------------------------------------------------------------------------
-
-- (SInt64)frameIndex
-{
-    return [self.audioFile frameIndex];
+-(EZOutput*)output {
+  NSAssert(_output,@"No output was found, this should by default be the EZOutput shared instance");
+  return _output;
 }
 
-//------------------------------------------------------------------------------
-
-- (BOOL)isPlaying
-{
-    return [self.output isPlaying];
+-(float)totalDuration {
+  NSAssert(_audioFile,@"No audio file to perform the seek on, check that EZAudioFile is not nil");
+  return _audioFile.totalDuration;
 }
 
-//------------------------------------------------------------------------------
-
-- (float)pan
-{
-    return [self.output pan];
+-(SInt64)totalFrames {
+  NSAssert(_audioFile,@"No audio file to perform the seek on, check that EZAudioFile is not nil");
+  return _audioFile.totalFrames;
 }
 
-//------------------------------------------------------------------------------
-
-- (SInt64)totalFrames
-{
-    return [self.audioFile totalFrames];
+-(NSURL *)url {
+  NSAssert(_audioFile,@"No audio file to perform the seek on, check that EZAudioFile is not nil");
+  return _audioFile.url;
 }
 
-//------------------------------------------------------------------------------
-
-- (float)volume
-{
-    return [self.output volume];
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - Setters
-//------------------------------------------------------------------------------
-
-- (void)setAudioFile:(EZAudioFile *)audioFile
-{
-    _audioFile = [audioFile copy];
-    _audioFile.delegate = self;
-    AudioStreamBasicDescription inputFormat = _audioFile.clientFormat;
-    [self.output setInputFormat:inputFormat];
-    [[NSNotificationCenter defaultCenter] postNotificationName:EZAudioPlayerDidChangeAudioFileNotification
-                                                        object:self];
+-(void)setAudioFile:(EZAudioFile *)audioFile {
+  if (_audioFile){
+    _audioFile.audioFileDelegate = nil;
+  }
+  _eof       = NO;
+  _audioFile = [EZAudioFile audioFileWithURL:audioFile.url andDelegate:self];
+  NSAssert(_output,@"No output was found, this should by default be the EZOutput shared instance");
+  [_output setAudioStreamBasicDescription:self.audioFile.clientFormat];    
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setCurrentTime:(NSTimeInterval)currentTime
-{
-    [self.audioFile setCurrentTime:currentTime];
-    [[NSNotificationCenter defaultCenter] postNotificationName:EZAudioPlayerDidSeekNotification
-                                                        object:self];
+-(void)setOutput:(EZOutput*)output {
+  _output                  = output;
+  _output.outputDataSource = self;
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setDevice:(EZAudioDevice *)device
-{
-    [self.output setDevice:device];
+#pragma mark - Methods
+-(void)play {
+  NSAssert(_audioFile,@"No audio file to perform the seek on, check that EZAudioFile is not nil");
+  if (_audioFile){
+    [_output startPlayback];
+    if (self.frameIndex != self.totalFrames){
+      _eof = NO;
+    }
+    if (self.audioPlayerDelegate){
+      if ([self.audioPlayerDelegate respondsToSelector:@selector(audioPlayer:didResumePlaybackOnAudioFile:)]){
+        // Notify the delegate we're starting playback
+        [self.audioPlayerDelegate audioPlayer:self didResumePlaybackOnAudioFile:_audioFile];
+      }
+    }
+  }
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setOutput:(EZOutput *)output
-{
-    _output = output;
-    _output.dataSource = self;
-    _output.delegate = self;
+-(void)pause {
+  NSAssert(self.audioFile,@"No audio file to perform the seek on, check that EZAudioFile is not nil");
+  if (_audioFile){
+    [_output stopPlayback];
+    if (self.audioPlayerDelegate){
+      if ([self.audioPlayerDelegate respondsToSelector:@selector(audioPlayer:didPausePlaybackOnAudioFile:)]){
+        // Notify the delegate we're pausing playback
+        [self.audioPlayerDelegate audioPlayer:self didPausePlaybackOnAudioFile:_audioFile];
+      }
+    }
+  }
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setPan:(float)pan
-{
-    [self.output setPan:pan];
-    [[NSNotificationCenter defaultCenter] postNotificationName:EZAudioPlayerDidChangePanNotification
-                                                        object:self];
+-(void)seekToFrame:(SInt64)frame {
+  NSAssert(_audioFile,@"No audio file to perform the seek on, check that EZAudioFile is not nil");
+  if (_audioFile){
+    [_audioFile seekToFrame:frame];
+  }
+  if (self.frameIndex != self.totalFrames){
+    _eof = NO;
+  }
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setVolume:(float)volume
-{
-    [self.output setVolume:volume];
-    [[NSNotificationCenter defaultCenter] postNotificationName:EZAudioPlayerDidChangeVolumeNotification
-                                                        object:self];
+-(void)stop {
+  NSAssert(_audioFile,@"No audio file to perform the seek on, check that EZAudioFile is not nil");
+  if (_audioFile){
+    [_output stopPlayback];
+    [_audioFile seekToFrame:0];
+    _eof = NO;
+  }
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Actions
-//------------------------------------------------------------------------------
-
-- (void)play
-{
-    [self.output startPlayback];
+#pragma mark - EZAudioFileDelegate
+-(void)audioFile:(EZAudioFile *)audioFile
+       readAudio:(float **)buffer
+  withBufferSize:(UInt32)bufferSize
+withNumberOfChannels:(UInt32)numberOfChannels {
+  if (self.audioPlayerDelegate){
+    if ([self.audioPlayerDelegate respondsToSelector:@selector(audioPlayer:readAudio:withBufferSize:withNumberOfChannels:inAudioFile:)]){
+      [self.audioPlayerDelegate audioPlayer:self
+                                  readAudio:buffer
+                             withBufferSize:bufferSize
+                       withNumberOfChannels:numberOfChannels
+                                inAudioFile:audioFile];
+    }
+  }
 }
 
-//------------------------------------------------------------------------------
-
-- (void)playAudioFile:(EZAudioFile *)audioFile
-{
-    //
-    // stop playing anything that might currently be playing
-    //
-    [self pause];
-    
-    //
-    // set new stream
-    //
-    self.audioFile = audioFile;
-    
-    //
-    // begin playback
-    //
-    [self play];
+-(void)audioFile:(EZAudioFile *)audioFile updatedPosition:(SInt64)framePosition {
+  if (self.audioPlayerDelegate){
+    if ([self.audioPlayerDelegate respondsToSelector:@selector(audioPlayer:updatedPosition:inAudioFile:)]){
+      [self.audioPlayerDelegate audioPlayer:self
+                            updatedPosition:framePosition
+                                inAudioFile:audioFile];
+    }
+  }
 }
 
-//------------------------------------------------------------------------------
-
-- (void)pause
-{
-    [self.output stopPlayback];
-}
-
-//------------------------------------------------------------------------------
-
-- (void)seekToFrame:(SInt64)frame
-{
-    [self.audioFile seekToFrame:frame];
-    [[NSNotificationCenter defaultCenter] postNotificationName:EZAudioPlayerDidSeekNotification
-                                                        object:self];
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - EZOutputDataSource
-//------------------------------------------------------------------------------
-
-- (OSStatus)        output:(EZOutput *)output
+-(void)             output:(EZOutput *)output
  shouldFillAudioBufferList:(AudioBufferList *)audioBufferList
         withNumberOfFrames:(UInt32)frames
-                 timestamp:(const AudioTimeStamp *)timestamp
 {
     if (self.audioFile)
     {
         UInt32 bufferSize;
-        BOOL eof;
         [self.audioFile readFrames:frames
                    audioBufferList:audioBufferList
                         bufferSize:&bufferSize
-                               eof:&eof];
-        if (eof && [self.delegate respondsToSelector:@selector(audioPlayer:reachedEndOfAudioFile:)]) 
-        {
-            [self.delegate audioPlayer:self reachedEndOfAudioFile:self.audioFile];
-        }
-        if (eof && self.shouldLoop)
+                               eof:&_eof];
+        if (_eof && self.shouldLoop)
         {
             [self seekToFrame:0];
         }
-        else if (eof)
-        {
-            [self pause];
-            [self seekToFrame:0];
-            [[NSNotificationCenter defaultCenter] postNotificationName:EZAudioPlayerDidReachEndOfFileNotification
-                                                                object:self];
-        }
-    }
-    return noErr;
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioFileDelegate
-//------------------------------------------------------------------------------
-
-- (void)audioFileUpdatedPosition:(EZAudioFile *)audioFile
-{
-    if ([self.delegate respondsToSelector:@selector(audioPlayer:updatedPosition:inAudioFile:)])
-    {
-        [self.delegate audioPlayer:self
-                   updatedPosition:[audioFile frameIndex]
-                       inAudioFile:audioFile];
     }
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - EZOutputDelegate
-//------------------------------------------------------------------------------
-
-- (void)output:(EZOutput *)output changedDevice:(EZAudioDevice *)device
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:EZAudioPlayerDidChangeOutputDeviceNotification
-                                                        object:self];
-}
-
-//------------------------------------------------------------------------------
-
-- (void)output:(EZOutput *)output changedPlayingState:(BOOL)isPlaying
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:EZAudioPlayerDidChangePlayStateNotification
-                                                        object:self];
-}
-
-//------------------------------------------------------------------------------
-
-- (void)       output:(EZOutput *)output
-          playedAudio:(float **)buffer
-       withBufferSize:(UInt32)bufferSize
- withNumberOfChannels:(UInt32)numberOfChannels
-{
-    if ([self.delegate respondsToSelector:@selector(audioPlayer:playedAudio:withBufferSize:withNumberOfChannels:inAudioFile:)])
-    {
-        [self.delegate audioPlayer:self
-                       playedAudio:buffer
-                    withBufferSize:bufferSize
-              withNumberOfChannels:numberOfChannels
-                       inAudioFile:self.audioFile];
-    }
-}
-
-//------------------------------------------------------------------------------
-
 @end

EZAudio/EZAudioPlot.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 9/2/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -23,52 +23,14 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
-#import <QuartzCore/QuartzCore.h>
+#import "TargetConditionals.h"
 #import "EZPlot.h"
 
 @class EZAudio;
 
-//------------------------------------------------------------------------------
-#pragma mark - Constants
-//------------------------------------------------------------------------------
+#define kEZAudioPlotMaxHistoryBufferLength (8192)
 
-/**
- The default value used for the maximum rolling history buffer length of any EZAudioPlot.
- @deprecated This constant is deprecated starting in version 0.2.0.
- @note Please use EZAudioPlotDefaultMaxHistoryBufferLength instead.
- */
-FOUNDATION_EXPORT UInt32 const kEZAudioPlotMaxHistoryBufferLength __attribute__((deprecated));
-
-/**
- The default value used for the default rolling history buffer length of any EZAudioPlot.
- @deprecated This constant is deprecated starting in version 0.2.0.
- @note Please use EZAudioPlotDefaultHistoryBufferLength instead.
- */
-FOUNDATION_EXPORT UInt32 const kEZAudioPlotDefaultHistoryBufferLength __attribute__((deprecated));
-
-/**
- The default value used for the default rolling history buffer length of any EZAudioPlot.
- */
-FOUNDATION_EXPORT UInt32 const EZAudioPlotDefaultHistoryBufferLength;
-
-/**
- The default value used for the maximum rolling history buffer length of any EZAudioPlot.
- */
-FOUNDATION_EXPORT UInt32 const EZAudioPlotDefaultMaxHistoryBufferLength;
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlotWaveformLayer
-//------------------------------------------------------------------------------
-
-/**
- The EZAudioPlotWaveformLayer is a lightweight subclass of the CAShapeLayer that allows implicit animations on the `path` key.
- */
-@interface EZAudioPlotWaveformLayer : CAShapeLayer
-@end
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlot
-//------------------------------------------------------------------------------
+#define kEZAudioPlotDefaultHistoryBufferLength (1024)
 
 /**
  `EZAudioPlot`, a subclass of `EZPlot`, is a cross-platform (iOS and OSX) class that plots an audio waveform using Core Graphics. 
@@ -84,116 +46,37 @@ FOUNDATION_EXPORT UInt32 const EZAudioPlotDefaultMaxHistoryBufferLength;
  
  */
 @interface EZAudioPlot : EZPlot
+{
+    CGPoint *plotData;
+    UInt32   plotLength;
+}
 
-/**
- A BOOL that allows optimizing the audio plot's drawing for real-time displays. Since the update function may be updating the plot's data very quickly (over 60 frames per second) this property will throttle the drawing calls to be 60 frames per second (or whatever the screen rate is). Specifically, it disables implicit path change animations on the `waveformLayer` and sets up a display link to render 60 fps (audio updating the plot at 44.1 kHz causes it to re-render 86 fps - far greater than what is needed for a visual display).
- */
-@property (nonatomic, assign) BOOL shouldOptimizeForRealtimePlot;
-
-//------------------------------------------------------------------------------
-
-/**
- A BOOL indicating whether the plot should center itself vertically.
- */
-@property (nonatomic, assign) BOOL shouldCenterYAxis;
-
-//------------------------------------------------------------------------------
-
-/**
- An EZAudioPlotWaveformLayer that is used to render the actual waveform. By switching the drawing code to Core Animation layers in version 0.2.0 most work, specifically the compositing step, is now done on the GPU. Hence, multiple EZAudioPlot instances can be used simultaneously with very low CPU overhead so these are now practical for table and collection views.
- */
-@property (nonatomic, strong) EZAudioPlotWaveformLayer *waveformLayer;
-
-//------------------------------------------------------------------------------
 #pragma mark - Adjust Resolution
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Adjusting The Resolution
 ///-----------------------------------------------------------
 
 /**
- Sets the length of the rolling history buffer (i.e. the number of points in the rolling plot's buffer). Can grow or shrink the display up to the maximum size specified by the `maximumRollingHistoryLength` method. Will return the actual set value, which will be either the given value if smaller than the `maximumRollingHistoryLength` or `maximumRollingHistoryLength` if a larger value is attempted to be set.
+ Sets the length of the rolling history display. Can grow or shrink the display up to the maximum size specified by the kEZAudioPlotMaxHistoryBufferLength macro. Will return the actual set value, which will be either the given value if smaller than the kEZAudioPlotMaxHistoryBufferLength or kEZAudioPlotMaxHistoryBufferLength if a larger value is attempted to be set. 
  @param  historyLength The new length of the rolling history buffer.
- @return The new value equal to the historyLength or the `maximumRollingHistoryLength`.
+ @return The new value equal to the historyLength or the kEZAudioPlotMaxHistoryBufferLength.
  */
 -(int)setRollingHistoryLength:(int)historyLength;
 
-//------------------------------------------------------------------------------
-
 /**
- Provides the length of the rolling history buffer (i.e. the number of points in the rolling plot's buffer).
+ Provides the length of the rolling history buffer
  *  @return An int representing the length of the rolling history buffer
  */
 -(int)rollingHistoryLength;
 
-//------------------------------------------------------------------------------
 #pragma mark - Subclass Methods
-//------------------------------------------------------------------------------
-
-///-----------------------------------------------------------
-/// @name Subclass Methods
-///-----------------------------------------------------------
 
 /**
- Main method that handles converting the points created from the `updatedBuffer:withBufferSize:` method into a CGPathRef to store in the `waveformLayer`. In this method you can create any path you'd like using the point array (for instance, maybe mapping the points to a circle instead of the standard 2D plane).
- @param points     An array of CGPoint structures, with the x values ranging from 0 - (pointCount - 1) and y values containing the last audio data's buffer.
- @param pointCount A UInt32 of the length of the point array.
- @param rect       An EZRect (CGRect on iOS or NSRect on OSX) that the path should be created relative to.
- @return A CGPathRef that is the path you'd like to store on the `waveformLayer` to visualize the audio data.
+ <#Description#>
+ @param data   <#theplotData description#>
+ @param length <#length description#>
  */
-- (CGPathRef)createPathWithPoints:(CGPoint *)points
-                       pointCount:(UInt32)pointCount
-                           inRect:(EZRect)rect;
+-(void)setSampleData:(float *)data
+              length:(int)length;
 
-//------------------------------------------------------------------------------
-
-/**
- Provides the default length of the rolling history buffer when the plot is initialized. Default is `EZAudioPlotDefaultHistoryBufferLength` constant.
- @return An int describing the initial length of the rolling history buffer.
- */
-- (int)defaultRollingHistoryLength;
-
-//------------------------------------------------------------------------------
-
-/**
- Called after the view has been created. Subclasses should use to add any additional methods needed instead of overriding the init methods.
- */
-- (void)setupPlot;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the default number of points that will be used to initialize the graph's points data structure that holds. Essentially the plot starts off as a flat line of this many points. Default is 100.
- @return An int describing the initial number of points the plot should have when flat lined.
- */
-- (int)initialPointCount;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the default maximum rolling history length - that is, the maximum amount of points the `setRollingHistoryLength:` method may be set to. If a length higher than this is set then the plot will likely crash because the appropriate resources are only allocated once during the plot's initialization step. Defualt is `EZAudioPlotDefaultMaxHistoryBufferLength` constant.
- @return An int describing the maximum length of the absolute rolling history buffer.
- */
-- (int)maximumRollingHistoryLength;
-
-//------------------------------------------------------------------------------
-
-/**
- Method to cause the waveform layer's path to get recreated and redrawn on screen using the last buffer of data provided. This is the equivalent to the drawRect: method used to normally subclass a view's drawing. This normally don't need to be overrode though - a better approach would be to override the `createPathWithPoints:pointCount:inRect:` method.
- */
-- (void)redraw;
-
-//------------------------------------------------------------------------------
-
-/**
- Main method used to copy the sample data from the source buffer and update the 
- plot. Subclasses can overwrite this method for custom behavior.
- @param data   A float array of the sample data. Subclasses should copy this data to a separate array to avoid threading issues.
- @param length The length of the float array as an int.
- */
--(void)setSampleData:(float *)data length:(int)length;
-
-//------------------------------------------------------------------------------
-
-@end
+@end

EZAudio/EZAudioPlot.m

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 9/2/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -24,442 +24,274 @@
 //  THE SOFTWARE.
 
 #import "EZAudioPlot.h"
-#import "EZAudioDisplayLink.h"
+#import "EZAudioUtilities.h"
 
-//------------------------------------------------------------------------------
-#pragma mark - Constants
-//------------------------------------------------------------------------------
+@interface EZAudioPlot () {
+//  BOOL             _hasData;
+//  TPCircularBuffer _historyBuffer;
 
-UInt32 const kEZAudioPlotMaxHistoryBufferLength = 8192;
-UInt32 const kEZAudioPlotDefaultHistoryBufferLength = 512;
-UInt32 const EZAudioPlotDefaultHistoryBufferLength = 512;
-UInt32 const EZAudioPlotDefaultMaxHistoryBufferLength = 8192;
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlot (Interface Extension)
-//------------------------------------------------------------------------------
-
-@interface EZAudioPlot () <EZAudioDisplayLinkDelegate>
-@property (nonatomic, strong) EZAudioDisplayLink *displayLink;
-@property (nonatomic, assign) EZPlotHistoryInfo  *historyInfo;
-@property (nonatomic, assign) CGPoint            *points;
-@property (nonatomic, assign) UInt32              pointCount;
+  // Rolling History
+  BOOL    _setMaxLength;
+  float   *_scrollHistory;
+  int     _scrollHistoryIndex;
+  UInt32  _scrollHistoryLength;
+  BOOL    _changingHistorySize;
+}
 @end
 
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlot (Implementation)
-//------------------------------------------------------------------------------
-
 @implementation EZAudioPlot
+@synthesize backgroundColor = _backgroundColor;
+@synthesize color           = _color;
+@synthesize gain            = _gain;
+@synthesize plotType        = _plotType;
+@synthesize shouldFill      = _shouldFill;
+@synthesize shouldMirror    = _shouldMirror;
 
-//------------------------------------------------------------------------------
-#pragma mark - Dealloc
-//------------------------------------------------------------------------------
-
-- (void)dealloc
-{
-    [EZAudioUtilities freeHistoryInfo:self.historyInfo];
-    free(self.points);
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - Initialization
-//------------------------------------------------------------------------------
-
-- (id)init
-{
-    self = [super init];
-    if (self)
-    {
-        [self initPlot];
-    }
-    return self;
+-(id)init {
+  self = [super init];
+  if(self){
+    [self initPlot];
+  }
+  return self;
 }
 
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self)
-    {
-        [self initPlot];
-    }
-    return self;
+-(id)initWithCoder:(NSCoder *)aDecoder {
+  self = [super initWithCoder:aDecoder];
+  if(self){
+    [self initPlot];
+  }
+  return self;
 }
 
 #if TARGET_OS_IPHONE
-- (id)initWithFrame:(CGRect)frameRect
+-(id)initWithFrame:(CGRect)frameRect {
 #elif TARGET_OS_MAC
-- (id)initWithFrame:(NSRect)frameRect
+-(id)initWithFrame:(NSRect)frameRect {
 #endif
-{
-    self = [super initWithFrame:frameRect];
-    if (self)
-    {
-        [self initPlot];
-    }
-    return self;
+  self = [super initWithFrame:frameRect];
+  if(self){
+    [self initPlot];
+  }
+  return self;
 }
-
+  
+-(void)initPlot {
 #if TARGET_OS_IPHONE
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-    [CATransaction begin];
-    [CATransaction setDisableActions:YES];
-    self.waveformLayer.frame = self.bounds;
-    [self redraw];
-    [CATransaction commit];
-}
+  self.backgroundColor = [UIColor blackColor];
+  self.color           = [UIColor colorWithHue:0 saturation:1.0 brightness:1.0 alpha:1.0];
 #elif TARGET_OS_MAC
-- (void)layout
-{
-    [super layout];
-    [CATransaction begin];
-    [CATransaction setDisableActions:YES];
-    self.waveformLayer.frame = self.bounds;
-    [self redraw];
-    [CATransaction commit];
-}
+  self.backgroundColor = [NSColor blackColor];
+  self.color           = [NSColor colorWithCalibratedHue:0 saturation:1.0 brightness:1.0 alpha:1.0];
 #endif
-
-- (void)initPlot
-{
-    self.shouldCenterYAxis = YES;
-    self.shouldOptimizeForRealtimePlot = YES;
-    self.gain = 1.0;
-    self.plotType = EZPlotTypeBuffer;
-    self.shouldMirror = NO;
-    self.shouldFill = NO;
-    
-    // Setup history window
-    [self resetHistoryBuffers];
-    
-    self.waveformLayer = [EZAudioPlotWaveformLayer layer];
-    self.waveformLayer.frame = self.bounds;
-    self.waveformLayer.lineWidth = 1.0f;
-    self.waveformLayer.fillColor = nil;
-    self.waveformLayer.backgroundColor = nil;
-    self.waveformLayer.opaque = YES;
-    
-#if TARGET_OS_IPHONE
-    self.color = [UIColor colorWithHue:0 saturation:1.0 brightness:1.0 alpha:1.0]; 
-#elif TARGET_OS_MAC
-    self.color = [NSColor colorWithCalibratedHue:0 saturation:1.0 brightness:1.0 alpha:1.0];
-    self.wantsLayer = YES;
-    self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawOnSetNeedsDisplay;
-#endif
-    self.backgroundColor = nil;
-    [self.layer insertSublayer:self.waveformLayer atIndex:0];
-    
-    //
-    // Allow subclass to initialize plot
-    //
-    [self setupPlot];
-    
-    self.points = calloc(EZAudioPlotDefaultMaxHistoryBufferLength, sizeof(CGPoint));
-    self.pointCount = [self initialPointCount];
-    [self redraw];
+  self.gain            = 1.0;
+  self.plotType        = EZPlotTypeRolling;
+  self.shouldMirror    = NO;
+  self.shouldFill      = NO;
+  plotData             = NULL;
+  _scrollHistory       = NULL;
+  _scrollHistoryLength = kEZAudioPlotDefaultHistoryBufferLength;
 }
-
-//------------------------------------------------------------------------------
-
-- (void)setupPlot
-{
-    //
-    // Override in subclass
-    //
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Setup
-//------------------------------------------------------------------------------
-
-- (void)resetHistoryBuffers
-{
-    //
-    // Clear any existing data
-    //
-    if (self.historyInfo)
-    {
-        [EZAudioUtilities freeHistoryInfo:self.historyInfo];
-    }
-    
-    self.historyInfo = [EZAudioUtilities historyInfoWithDefaultLength:[self defaultRollingHistoryLength]
-                                                        maximumLength:[self maximumRollingHistoryLength]];
-}
-
-//------------------------------------------------------------------------------
+  
 #pragma mark - Setters
-//------------------------------------------------------------------------------
-
-- (void)setBackgroundColor:(id)backgroundColor
-{
-    [super setBackgroundColor:backgroundColor];
-    self.layer.backgroundColor = [backgroundColor CGColor];
+-(void)setBackgroundColor:(id)backgroundColor {
+  _backgroundColor = backgroundColor;
+  [self _refreshDisplay];
+}
+  
+-(void)setColor:(id)color {
+  _color = color;
+  [self _refreshDisplay];
+}
+  
+-(void)setGain:(float)gain {
+  _gain = gain;
+  [self _refreshDisplay];
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setColor:(id)color
-{
-    [super setColor:color];
-    self.waveformLayer.strokeColor = [color CGColor];
-    if (self.shouldFill)
-    {
-        self.waveformLayer.fillColor = [color CGColor];
-    }
+-(void)setPlotType:(EZPlotType)plotType {
+  _plotType = plotType;
+  [self _refreshDisplay];
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setShouldOptimizeForRealtimePlot:(BOOL)shouldOptimizeForRealtimePlot
-{
-    _shouldOptimizeForRealtimePlot = shouldOptimizeForRealtimePlot;
-    if (shouldOptimizeForRealtimePlot && !self.displayLink)
-    {
-        self.displayLink = [EZAudioDisplayLink displayLinkWithDelegate:self];
-        [self.displayLink start];
-    }
-    else
-    {
-        [self.displayLink stop];
-        self.displayLink = nil;
-    }
+-(void)setShouldFill:(BOOL)shouldFill {
+  _shouldFill = shouldFill;
+  [self _refreshDisplay];
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setShouldFill:(BOOL)shouldFill
-{
-    [super setShouldFill:shouldFill];
-    self.waveformLayer.fillColor = shouldFill ? [self.color CGColor] : nil;
+-(void)setShouldMirror:(BOOL)shouldMirror {
+  _shouldMirror = shouldMirror;
+  [self _refreshDisplay];
 }
-
-//------------------------------------------------------------------------------
-#pragma mark - Drawing
-//------------------------------------------------------------------------------
-
-- (void)clear
-{
-    if (self.pointCount > 0)
-    {
-        [self resetHistoryBuffers];
-        float data[self.pointCount];
-        memset(data, 0, self.pointCount * sizeof(float));
-        [self setSampleData:data length:self.pointCount];
-        [self redraw];
-    }
-}
-
-//------------------------------------------------------------------------------
-
-- (void)redraw
-{
-    EZRect frame = [self.waveformLayer frame];
-    CGPathRef path = [self createPathWithPoints:self.points
-                                     pointCount:self.pointCount
-                                         inRect:frame];
-    if (self.shouldOptimizeForRealtimePlot)
-    {
-        [CATransaction begin];
-        [CATransaction setDisableActions:YES];
-        self.waveformLayer.path = path;
-        [CATransaction commit];
-    }
-    else
-    {
-        self.waveformLayer.path = path;
-    }
-    CGPathRelease(path);
-}
-
-//------------------------------------------------------------------------------
-
-- (CGPathRef)createPathWithPoints:(CGPoint *)points
-                  pointCount:(UInt32)pointCount
-                      inRect:(EZRect)rect
-{
-    CGMutablePathRef path = NULL;
-    if (pointCount > 0)
-    {
-        path = CGPathCreateMutable();
-        double xscale = (rect.size.width) / ((float)self.pointCount);
-        double halfHeight = floor(rect.size.height / 2.0);
-        int deviceOriginFlipped = [self isDeviceOriginFlipped] ? -1 : 1;
-        CGAffineTransform xf = CGAffineTransformIdentity;
-        CGFloat translateY = 0.0f;
-        if (!self.shouldCenterYAxis)
-        {
+  
+-(void)_refreshDisplay {
 #if TARGET_OS_IPHONE
-            translateY = CGRectGetHeight(rect);
+  [self setNeedsDisplay];
 #elif TARGET_OS_MAC
-            translateY = 0.0f;
+  [self setNeedsDisplay:YES];
 #endif
-        }
-        else
-        {
-            translateY = halfHeight + rect.origin.y;
-        }
-        xf = CGAffineTransformTranslate(xf, 0.0, translateY);
-        double yScaleFactor = halfHeight;
-        if (!self.shouldCenterYAxis)
-        {
-            yScaleFactor = 2.0 * halfHeight;
-        }
-        xf = CGAffineTransformScale(xf, xscale, deviceOriginFlipped * yScaleFactor);
-        CGPathAddLines(path, &xf, self.points, self.pointCount);
-        if (self.shouldMirror)
-        {
-            xf = CGAffineTransformScale(xf, 1.0f, -1.0f);
-            CGPathAddLines(path, &xf, self.points, self.pointCount);
-        }
-        if (self.shouldFill)
-        {
-            CGPathCloseSubpath(path);
-        }
-    }
-    return path;
 }
-
-//------------------------------------------------------------------------------
+  
+#pragma mark - Get Data
+-(void)setSampleData:(float *)data
+              length:(int)length {
+  if (plotData != nil){
+    free(plotData);
+  }
+  
+  plotData   = (CGPoint *)calloc(sizeof(CGPoint),length);
+  plotLength = length;
+  
+  for(int i = 0; i < length; i++) {
+    data[i]     = i == 0 ? 0 : data[i];
+    plotData[i] = CGPointMake(i,data[i] * _gain);
+  }
+    
+  [self _refreshDisplay];
+}
+  
 #pragma mark - Update
-//------------------------------------------------------------------------------
-
-- (void)updateBuffer:(float *)buffer withBufferSize:(UInt32)bufferSize
-{
-    // append the buffer to the history
-    [EZAudioUtilities appendBuffer:buffer
-                    withBufferSize:bufferSize
-                     toHistoryInfo:self.historyInfo];
+-(void)updateBuffer:(float *)buffer withBufferSize:(UInt32)bufferSize {
+  if (_plotType == EZPlotTypeRolling){
     
-    // copy samples
-    switch (self.plotType)
-    {
-        case EZPlotTypeBuffer:
-            [self setSampleData:buffer
-                         length:bufferSize];
-            break;
-        case EZPlotTypeRolling:
-            
-            [self setSampleData:self.historyInfo->buffer
-                         length:self.historyInfo->bufferSize];
-            break;
-        default:
-            break;
-    }
+    // Update the scroll history datasource
+    [EZAudioUtilities updateScrollHistory:&_scrollHistory
+                      withLength:_scrollHistoryLength
+                         atIndex:&_scrollHistoryIndex
+                      withBuffer:buffer
+                  withBufferSize:bufferSize
+            isResolutionChanging:&_changingHistorySize];
+
+    // 
+    [self setSampleData:_scrollHistory
+                 length:(!_setMaxLength?kEZAudioPlotMaxHistoryBufferLength:_scrollHistoryLength)];
+    _setMaxLength = YES;
     
-    // update drawing
-    if (!self.shouldOptimizeForRealtimePlot)
-    {
-        [self redraw];
-    }
+  }
+  else if (_plotType == EZPlotTypeBuffer){
+    
+    [self setSampleData:buffer
+                 length:bufferSize];
+    
+  }
+  else {
+    
+    // Unknown plot type
+    
+  }
 }
-
-//------------------------------------------------------------------------------
-
-- (void)setSampleData:(float *)data length:(int)length
-{
-    CGPoint *points = self.points;
-    for (int i = 0; i < length; i++)
-    {
-        points[i].x = i;
-        points[i].y = data[i] * self.gain;
-    }
-    points[0].y = points[length - 1].y = 0.0f;
-    self.pointCount = length;
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Adjusting History Resolution
-//------------------------------------------------------------------------------
-
-- (int)rollingHistoryLength
-{
-    return self.historyInfo->bufferSize;
-}
-
-//------------------------------------------------------------------------------
-
-- (int)setRollingHistoryLength:(int)historyLength
-{
-    self.historyInfo->bufferSize = MIN(EZAudioPlotDefaultMaxHistoryBufferLength, historyLength);
-    return self.historyInfo->bufferSize;
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Subclass
-//------------------------------------------------------------------------------
-
-- (int)defaultRollingHistoryLength
-{
-    return EZAudioPlotDefaultHistoryBufferLength;
-}
-
-//------------------------------------------------------------------------------
-
-- (int)initialPointCount
-{
-    return 100;
-}
-
-//------------------------------------------------------------------------------
-
-- (int)maximumRollingHistoryLength
-{
-    return EZAudioPlotDefaultMaxHistoryBufferLength;
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Utility
-//------------------------------------------------------------------------------
-
-- (BOOL)isDeviceOriginFlipped
-{
-    BOOL isDeviceOriginFlipped = NO;
+    
 #if TARGET_OS_IPHONE
-    isDeviceOriginFlipped = YES;
-#elif TARGET_OS_MAC
-#endif
-    return isDeviceOriginFlipped;
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioDisplayLinkDelegate
-//------------------------------------------------------------------------------
-
-- (void)displayLinkNeedsDisplay:(EZAudioDisplayLink *)displayLink
+- (void)drawRect:(CGRect)rect
 {
-    [self redraw];
+  CGContextRef ctx = UIGraphicsGetCurrentContext();
+  CGContextSaveGState(ctx);
+  CGRect frame = self.bounds;
+#elif TARGET_OS_MAC
+  - (void)drawRect:(NSRect)dirtyRect
+  {
+    [[NSGraphicsContext currentContext] saveGraphicsState];
+    NSGraphicsContext * nsGraphicsContext = [NSGraphicsContext currentContext];
+    CGContextRef ctx = (CGContextRef) [nsGraphicsContext graphicsPort];
+    NSRect frame = self.bounds;
+#endif
+    
+#if TARGET_OS_IPHONE
+    // Set the background color
+    [(UIColor*)self.backgroundColor set];
+    UIRectFill(frame);
+    // Set the waveform line color
+    [(UIColor*)self.color set];
+#elif TARGET_OS_MAC
+    [(NSColor*)self.backgroundColor set];
+    NSRectFill(frame);
+    [(NSColor*)self.color set];
+#endif
+    
+    if(plotLength > 0) {
+      
+      plotData[plotLength-1] = CGPointMake(plotLength-1,0.0f);
+      
+      CGMutablePathRef halfPath = CGPathCreateMutable();
+      CGPathAddLines(halfPath,
+                     NULL,
+                     plotData,
+                     plotLength);
+      CGMutablePathRef path = CGPathCreateMutable();
+      
+      double xscale = (frame.size.width) / (float)plotLength;
+      double halfHeight = floor( frame.size.height / 2.0);
+      
+      // iOS drawing origin is flipped by default so make sure we account for that
+      int deviceOriginFlipped = 1;
+#if TARGET_OS_IPHONE
+      deviceOriginFlipped = -1;
+#elif TARGET_OS_MAC
+      deviceOriginFlipped = 1;
+#endif
+      
+      CGAffineTransform xf = CGAffineTransformIdentity;
+      xf = CGAffineTransformTranslate( xf, frame.origin.x , halfHeight + frame.origin.y);
+      xf = CGAffineTransformScale( xf, xscale, deviceOriginFlipped*halfHeight);
+      CGPathAddPath( path, &xf, halfPath);
+      
+      if (self.shouldMirror){
+        xf = CGAffineTransformIdentity;
+        xf = CGAffineTransformTranslate( xf, frame.origin.x , halfHeight + frame.origin.y);
+        xf = CGAffineTransformScale( xf, xscale, -deviceOriginFlipped*(halfHeight));
+        CGPathAddPath( path, &xf, halfPath);
+      }
+      CGPathRelease( halfPath);
+      
+      // Now, path contains the full waveform path.
+      CGContextAddPath(ctx, path);
+      
+      // Make this color customizable
+      if (self.shouldFill){
+        CGContextFillPath(ctx);
+      }
+      else {
+        CGContextStrokePath(ctx);
+      }
+      CGPathRelease(path);
+    }
+    
+#if TARGET_OS_IPHONE
+    CGContextRestoreGState(ctx);
+#elif TARGET_OS_MAC
+    [[NSGraphicsContext currentContext] restoreGraphicsState];
+#endif
+}
+  
+#pragma mark - Adjust Resolution
+-(int)setRollingHistoryLength:(int)historyLength {
+  historyLength = MIN(historyLength,kEZAudioPlotMaxHistoryBufferLength);
+  size_t floatByteSize = sizeof(float);
+  _changingHistorySize = YES;
+  if (_scrollHistoryLength != historyLength){
+    _scrollHistoryLength = historyLength;
+  }
+  _scrollHistory = realloc(_scrollHistory,_scrollHistoryLength*floatByteSize);
+  if (_scrollHistoryIndex < _scrollHistoryLength){
+    memset(&_scrollHistory[_scrollHistoryIndex],
+           0,
+           (_scrollHistoryLength-_scrollHistoryIndex)*floatByteSize);
+  }
+  else {
+    _scrollHistoryIndex = _scrollHistoryLength;
+  }
+  _changingHistorySize = NO;
+  return historyLength;
 }
 
-//------------------------------------------------------------------------------
+-(int)rollingHistoryLength {
+  return _scrollHistoryLength;
+}
+    
+-(void)dealloc {
+  if (plotData){
+    free(plotData);
+  }
+}
 
 @end
-
-////------------------------------------------------------------------------------
-#pragma mark - EZAudioPlotWaveformLayer (Implementation)
-////------------------------------------------------------------------------------
-
-@implementation EZAudioPlotWaveformLayer
-
-- (id<CAAction>)actionForKey:(NSString *)event
-{
-    if ([event isEqualToString:@"path"])
-    {
-        if ([CATransaction disableActions])
-        {
-            return nil;
-        }
-        else
-        {
-            CABasicAnimation *animation = [CABasicAnimation animation];
-            animation.timingFunction = [CATransaction animationTimingFunction];
-            animation.duration = [CATransaction animationDuration];
-            return animation;
-        }
-        return nil;
-    }
-    return [super actionForKey:event];
-}
-
-@end

EZAudio/EZAudioPlotGL.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 11/22/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -23,134 +23,126 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
-#import <GLKit/GLKit.h>
+#import "TargetConditionals.h"
 #import "EZPlot.h"
-#if !TARGET_OS_IPHONE
-#import <OpenGL/OpenGL.h>
+
+#if TARGET_OS_IPHONE
+#import <GLKit/GLKit.h>
+@class EZAudioPlotGLKViewController;
+#elif TARGET_OS_MAC
+#import <Cocoa/Cocoa.h>
+#import <GLKit/GLKit.h>
+#import <OpenGL/gl3.h>
+#import <QuartzCore/CVDisplayLink.h>
 #endif
 
-//------------------------------------------------------------------------------
-#pragma mark - Data Structures
-//------------------------------------------------------------------------------
+#pragma mark - Enumerations
+/**
+ Constant drawing types wrapping around the OpenGL equivalents. In the audio drawings the line strip will be the stroked graph while the triangle will provide the filled equivalent.
+ */
+typedef NS_ENUM(NSUInteger,EZAudioPlotGLDrawType){
+  /**
+   *  Maps to the OpenGL constant for a line strip, which for the audio graph will correspond to a stroked drawing (no fill).
+   */
+  EZAudioPlotGLDrawTypeLineStrip     = GL_LINE_STRIP,
+  /**
+   *  Maps to the OpenGL constant for a triangle strip, which for the audio graph will correspond to a filled drawing.
+   */
+  EZAudioPlotGLDrawTypeTriangleStrip = GL_TRIANGLE_STRIP
+};
 
-typedef struct
-{
-    GLfloat x;
-    GLfloat y;
+#pragma mark - Structures
+/**
+ A structure describing a 2D point (x,y) in space for an audio plot.
+ */
+typedef struct {
+  GLfloat x;
+  GLfloat y;
 } EZAudioPlotGLPoint;
 
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlotGL
-//------------------------------------------------------------------------------
-
 /**
- EZAudioPlotGL is a subclass of either a GLKView on iOS or an NSOpenGLView on OSX. As of 0.6.0 this class no longer depends on an embedded GLKViewController for iOS as the display link is just manually managed within this single view instead. The EZAudioPlotGL provides the same kind of audio plot as the EZAudioPlot, but uses OpenGL to GPU-accelerate the drawing of the points, which means you can fit a lot more points and complex geometries.
+ EZAudioPlotGL is a subclass of either the EZPlot on iOS or an NSOpenGLView on OSX. I apologize ahead of time for the weirdness in the docs for this class, but I had to do a bit of hackery to get a universal namespace for something works on both iOS and OSX without any additional components. The EZAudioPlotGL provides an the same utilities and interface as the EZAudioPlot with the added benefit of being GPU-accelerated. This is the recommended plot to use on iOS devices to get super fast real-time drawings of audio streams. For the methods and properties below I've included notes on the bottom just indicating which OS they correspond to. In most (if not all) use cases you can just refer to the EZPlot documentation to see which custom properties can be setup. There update function is the same as the EZPlot as well: `updateBuffer:withBufferSize:`
  */
 #if TARGET_OS_IPHONE
-@interface EZAudioPlotGL : GLKView
+@interface EZAudioPlotGL : EZPlot
 #elif TARGET_OS_MAC
 @interface EZAudioPlotGL : NSOpenGLView
 #endif
 
-//------------------------------------------------------------------------------
-#pragma mark - Properties
-//------------------------------------------------------------------------------
+#if TARGET_OS_IPHONE
 
+// Inherited from EZPlot
+
+#elif TARGET_OS_MAC
+
+#pragma mark - Properties
 ///-----------------------------------------------------------
 /// @name Customizing The Plot's Appearance
 ///-----------------------------------------------------------
+/**
+ The default background color of the plot. For iOS the color is specified as a UIColor while for OSX the color is an NSColor. The default value on both platforms is black.
+ */
+@property (nonatomic,strong) id backgroundColor;
 
 /**
- The default background color of the plot. For iOS the color is specified as a UIColor while for OSX the color is an NSColor. The default value on both platforms is a sweet looking green. 
- @warning On OSX, if you set the background to a value where the alpha component is 0 then the EZAudioPlotGL will automatically set its superview to be layer-backed.
+ The default color of the plot's data (i.e. waveform, y-axis values). For iOS the color is specified as a UIColor while for OSX the color is an NSColor. The default value on both platforms is red.
  */
-#if TARGET_OS_IPHONE
-@property (nonatomic, strong) IBInspectable UIColor *backgroundColor;
-#elif TARGET_OS_MAC
-@property (nonatomic, strong) IBInspectable NSColor *backgroundColor;
-#endif
-
-//------------------------------------------------------------------------------
-
-/**
- The default color of the plot's data (i.e. waveform, y-axis values). For iOS the color is specified as a UIColor while for OSX the color is an NSColor. The default value on both platforms is white.
- */
-#if TARGET_OS_IPHONE
-@property (nonatomic, strong) IBInspectable UIColor *color;
-#elif TARGET_OS_MAC
-@property (nonatomic, strong) IBInspectable NSColor *color;
-#endif
-
-//------------------------------------------------------------------------------
+@property (nonatomic,strong) id color;
 
 /**
  The plot's gain value, which controls the scale of the y-axis values. The default value of the gain is 1.0f and should always be greater than 0.0f.
  */
-@property (nonatomic, assign) IBInspectable  float gain;
-
-//------------------------------------------------------------------------------
+@property (nonatomic,assign,setter=setGain:) float gain;
 
 /**
- The type of plot as specified by the `EZPlotType` enumeration (i.e. a buffer or rolling plot type). Default is EZPlotTypeBuffer.
+ The type of plot as specified by the `EZPlotType` enumeration (i.e. a buffer or rolling plot type).
  */
-@property (nonatomic, assign) EZPlotType plotType;
-
-//------------------------------------------------------------------------------
+@property (nonatomic,assign,setter=setPlotType:) EZPlotType plotType;
 
 /**
- A BOOL indicating whether or not to fill in the graph. A value of YES will make a filled graph (filling in the space between the x-axis and the y-value), while a value of NO will create a stroked graph (connecting the points along the y-axis). Default is NO.
+ A BOOL indicating whether or not to fill in the graph. A value of YES will make a filled graph (filling in the space between the x-axis and the y-value), while a value of NO will create a stroked graph (connecting the points along the y-axis).
  */
-@property (nonatomic, assign) IBInspectable BOOL shouldFill;
-
-//------------------------------------------------------------------------------
+@property (nonatomic,assign,setter=setShouldFill:) BOOL shouldFill;
 
 /**
- A boolean indicating whether the graph should be rotated along the x-axis to give a mirrored reflection. This is typical for audio plots to produce the classic waveform look. A value of YES will produce a mirrored reflection of the y-values about the x-axis, while a value of NO will only plot the y-values. Default is NO.
+ A boolean indicating whether the graph should be rotated along the x-axis to give a mirrored reflection. This is typical for audio plots to produce the classic waveform look. A value of YES will produce a mirrored reflection of the y-values about the x-axis, while a value of NO will only plot the y-values.
  */
-@property (nonatomic, assign) IBInspectable BOOL shouldMirror;
-
-//------------------------------------------------------------------------------
-#pragma mark - Updating The Plot
-//------------------------------------------------------------------------------
+@property (nonatomic,assign,setter=setShouldMirror:) BOOL shouldMirror;
 
+#pragma mark - Get Samples
 ///-----------------------------------------------------------
 /// @name Updating The Plot
 ///-----------------------------------------------------------
-
 /**
  Updates the plot with the new buffer data and tells the view to redraw itself. Caller will provide a float array with the values they expect to see on the y-axis. The plot will internally handle mapping the x-axis and y-axis to the current view port, any interpolation for fills effects, and mirroring.
  @param buffer     A float array of values to map to the y-axis.
  @param bufferSize The size of the float array that will be mapped to the y-axis.
+ @warning The bufferSize is expected to be the same, constant value once initial triggered. For plots using OpenGL a vertex buffer object will be allocated with a maximum buffersize of (2 * the initial given buffer size) to account for any interpolation necessary for filling in the graph. Updates use the glBufferSubData(...) function, which will crash if the buffersize exceeds the initial maximum allocated size.
  */
--(void)updateBuffer:(float *)buffer withBufferSize:(UInt32)bufferSize;
+-(void)updateBuffer:(float *)buffer
+     withBufferSize:(UInt32)bufferSize;
+
+#endif
 
-//------------------------------------------------------------------------------
 #pragma mark - Adjust Resolution
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Adjusting The Resolution
 ///-----------------------------------------------------------
 
 /**
- Sets the length of the rolling history buffer (i.e. the number of points in the rolling plot's buffer). Can grow or shrink the display up to the maximum size specified by the `maximumRollingHistoryLength` method. Will return the actual set value, which will be either the given value if smaller than the `maximumRollingHistoryLength` or `maximumRollingHistoryLength` if a larger value is attempted to be set.
+ Sets the length of the rolling history display. Can grow or shrink the display up to the maximum size specified by the kEZAudioPlotMaxHistoryBufferLength macro. Will return the actual set value, which will be either the given value if smaller than the kEZAudioPlotMaxHistoryBufferLength or kEZAudioPlotMaxHistoryBufferLength if a larger value is attempted to be set.
  @param  historyLength The new length of the rolling history buffer.
- @return The new value equal to the historyLength or the `maximumRollingHistoryLength`.
+ @return The new value equal to the historyLength or the kEZAudioPlotMaxHistoryBufferLength.
  */
 -(int)setRollingHistoryLength:(int)historyLength;
 
-//------------------------------------------------------------------------------
-
 /**
- Provides the length of the rolling history buffer (i.e. the number of points in the rolling plot's buffer).
+ Provides the length of the rolling history buffer
  *  @return An int representing the length of the rolling history buffer
  */
 -(int)rollingHistoryLength;
 
-//------------------------------------------------------------------------------
-#pragma mark - Clearing The Plot
-//------------------------------------------------------------------------------
-
+#pragma mark - Shared Methods
 ///-----------------------------------------------------------
 /// @name Clearing The Plot
 ///-----------------------------------------------------------
@@ -160,92 +152,32 @@ typedef struct
  */
 -(void)clear;
 
-//------------------------------------------------------------------------------
-#pragma mark - Start/Stop Display Link
-//------------------------------------------------------------------------------
-
-/**
- Call this method to tell the EZAudioDisplayLink to stop drawing temporarily.
- */
-- (void)pauseDrawing;
-
-//------------------------------------------------------------------------------
-
-/**
-  Call this method to manually tell the EZAudioDisplayLink to start drawing again.
- */
-- (void)resumeDrawing;
-
-//------------------------------------------------------------------------------
-#pragma mark - Subclass
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
-/// @name Customizing The Drawing
+/// @name Shared OpenGL Methods
 ///-----------------------------------------------------------
+/**
+ Converts a float array to an array of EZAudioPlotGLPoint structures that hold the (x,y) values the OpenGL buffer needs to properly plot its points.
+ @param graph       A pointer to the array that should hold the EZAudioPlotGLPoint structures.
+ @param graphSize   The size (or length) of the array with the EZAudioPlotGLPoint structures.
+ @param drawingType The EZAudioPlotGLDrawType constant defining whether the plot should interpolate between points for a triangle strip (filled waveform) or not for a line strip (stroked waveform)
+ @param buffer      The float array holding the audio data
+ @param bufferSize  The size of the float array holding the audio data
+ @param gain        The gain (always greater than 0.0) to apply to the amplitudes (y-values) of the graph. Y-values can only range from -1.0 to 1.0 so any value that's greater will be rounded to -1.0 or 1.0.
+ */
++(void)fillGraph:(EZAudioPlotGLPoint*)graph
+   withGraphSize:(UInt32)graphSize
+  forDrawingType:(EZAudioPlotGLDrawType)drawingType
+      withBuffer:(float*)buffer
+  withBufferSize:(UInt32)bufferSize
+        withGain:(float)gain;
 
 /**
- This method is used to perform the actual OpenGL drawing code to clear the background and draw the lines representing the 2D audio plot. Subclasses can use the current implementation as an example and implement their own custom geometries. This is the analogy of overriding the drawRect: method in an NSView or UIView.
- @param points       An array of EZAudioPlotGLPoint structures representing the mapped audio data to x,y coordinates. The x-axis goes from 0 to the number of points (pointCount) while the y-axis goes from -1 to 1. Check out the implementation of this method to see how the model view matrix of the base effect is transformed to map this properly to the viewport.
- @param pointCount   A UInt32 representing the number of points contained in the points array.
- @param baseEffect   An optional GLKBaseEffect to use as a default shader. Call prepareToDraw on the base effect before any glDrawArrays call.
- @param vbo          The Vertex Buffer Object used to buffer the point data.
- @param vab          The Vertex Array Buffer used to bind the Vertex Buffer Object. This is a Mac only thing, you can ignore this completely on iOS.
- @param interpolated A BOOL indicating whether the data has been interpolated. This means the point data is twice as long, where every other point is 0 on the y-axis to allow drawing triangle stripes for filled in waveforms. Typically if the point data is interpolated you will be using the GL_TRIANGLE_STRIP drawing mode, while non-interpolated plots will just use a GL_LINE_STRIP drawing mode.
- @param mirrored     A BOOL indicating whether the plot should be mirrored about the y-axis (or whatever geometry you come up with).
- @param gain         A float representing a gain that should be used to influence the height or intensity of your geometry's shape. A gain of 0.0 means silence, a gain of 1.0 means full volume (you're welcome to boost this to whatever you want).
+ Determines the proper size of a graph given a EZAudioPlotGLDrawType (line strip or triangle strip) and the size of the incoming buffer. Triangle strips require interpolating between points so the buffer becomes 2*bufferSize
+ @param drawingType The EZAudioPlotGLDraw type (line strip or triangle strip)
+ @param bufferSize  The size of the float array holding the audio data coming in.
+ @return A Int32 representing the proper graph size that should be used to account for any necessary interpolating between points.
  */
-- (void)redrawWithPoints:(EZAudioPlotGLPoint *)points
-              pointCount:(UInt32)pointCount
-              baseEffect:(GLKBaseEffect *)baseEffect
-      vertexBufferObject:(GLuint)vbo
-       vertexArrayBuffer:(GLuint)vab
-            interpolated:(BOOL)interpolated
-                mirrored:(BOOL)mirrored
-                    gain:(float)gain;
++(UInt32)graphSizeForDrawingType:(EZAudioPlotGLDrawType)drawingType
+                  withBufferSize:(UInt32)bufferSize;
 
-//------------------------------------------------------------------------------
-
-/**
- Called during the OpenGL run loop to constantly update the drawing 60 fps. Callers can use this force update the screen while subclasses can override this for complete control over their rendering. However, subclasses are more encouraged to use the `redrawWithPoints:pointCount:baseEffect:vertexBufferObject:vertexArrayBuffer:interpolated:mirrored:gain:`
- */
-- (void)redraw;
-
-//------------------------------------------------------------------------------
-
-/**
- Called after the view has been created. Subclasses should use to add any additional methods needed instead of overriding the init methods.
- */
-- (void)setup;
-
-//------------------------------------------------------------------------------
-
-/**
- Main method used to copy the sample data from the source buffer and update the
- plot. Subclasses can overwrite this method for custom behavior.
- @param data   A float array of the sample data. Subclasses should copy this data to a separate array to avoid threading issues.
- @param length The length of the float array as an int.
- */
-- (void)setSampleData:(float *)data length:(int)length;
-
-///-----------------------------------------------------------
-/// @name Subclass Methods
-///-----------------------------------------------------------
-
-/**
- Provides the default length of the rolling history buffer when the plot is initialized. Default is `EZAudioPlotDefaultHistoryBufferLength` constant.
- @return An int describing the initial length of the rolling history buffer.
- */
-- (int)defaultRollingHistoryLength;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the default maximum rolling history length - that is, the maximum amount of points the `setRollingHistoryLength:` method may be set to. If a length higher than this is set then the plot will likely crash because the appropriate resources are only allocated once during the plot's initialization step. Defualt is `EZAudioPlotDefaultMaxHistoryBufferLength` constant.
- @return An int describing the maximum length of the absolute rolling history buffer.
- */
-- (int)maximumRollingHistoryLength;
-
-//------------------------------------------------------------------------------
-
-@end
+@end

EZAudio/EZAudioPlotGLKViewController.h

@@ -0,0 +1,127 @@
+//
+//  EZAudioPlotGLKViewController.h
+//  EZAudio
+//
+//  Created by Syed Haris Ali on 11/22/13.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+#import "TargetConditionals.h"
+
+#if TARGET_OS_IPHONE
+
+#import "EZAudioPlotGL.h"
+
+@class EZAudio;
+
+/**
+ EZAudioPlotGLKViewController is a subclass of the GLKViewController and handles the OpenGL drawing routine for iOS OpenGL ES views. This class has not been used outside the scope of the EZAudioPlotGL, but should be safe to use by itself if the intended use case is to have a view controller take up the whole screen.
+ */
+@interface EZAudioPlotGLKViewController : GLKViewController
+
+#pragma mark - Properties
+///-----------------------------------------------------------
+/// @name Customizing The Plot's Appearance
+///-----------------------------------------------------------
+/**
+ The default background color of the plot. For iOS the color is specified as a UIColor while for OSX the color is an NSColor. The default value on both platforms is black.
+ */
+@property (nonatomic,strong) UIColor *backgroundColor;
+
+/**
+ The default shader to use to fill the graph.
+ */
+@property (nonatomic,strong) GLKBaseEffect *baseEffect;
+
+/**
+ The default color of the plot's data (i.e. waveform, y-axis values). For iOS the color is specified as a UIColor while for OSX the color is an NSColor. The default value on both platforms is red.
+ */
+@property (nonatomic,strong) UIColor *color;
+
+/**
+ The OpenGL ES context (EAGLContext) in which to perform the drawing
+ */
+@property (nonatomic,strong) EAGLContext *context;
+
+/**
+ The EZAudioPlotGLDrawType specifying which OpenGL primitive to use for drawing (either line strip for stroke and no fill or triangle strip for fill)
+ */
+@property (nonatomic,assign) EZAudioPlotGLDrawType drawingType;
+
+/**
+ The plot's gain value, which controls the scale of the y-axis values. The default value of the gain is 1.0f and should always be greater than 0.0f.
+ */
+@property (nonatomic,assign,setter=setGain:) float gain;
+
+/**
+ The type of plot as specified by the `EZPlotType` enumeration (i.e. a buffer or rolling plot type).
+ */
+@property (nonatomic,assign,setter=setPlotType:) EZPlotType plotType;
+
+/**
+ A boolean indicating whether the graph should be rotated along the x-axis to give a mirrored reflection. This is typical for audio plots to produce the classic waveform look. A value of YES will produce a mirrored reflection of the y-values about the x-axis, while a value of NO will only plot the y-values.
+ */
+@property (nonatomic,assign,setter=setShouldMirror:) BOOL shouldMirror;
+
+#pragma mark - Adjust Resolution
+///-----------------------------------------------------------
+/// @name Adjusting The Resolution
+///-----------------------------------------------------------
+
+/**
+ Sets the length of the rolling history display. Can grow or shrink the display up to the maximum size specified by the kEZAudioPlotMaxHistoryBufferLength macro. Will return the actual set value, which will be either the given value if smaller than the kEZAudioPlotMaxHistoryBufferLength or kEZAudioPlotMaxHistoryBufferLength if a larger value is attempted to be set.
+ @param  historyLength The new length of the rolling history buffer.
+ @return The new value equal to the historyLength or the kEZAudioPlotMaxHistoryBufferLength.
+ */
+-(int)setRollingHistoryLength:(int)historyLength;
+
+/**
+ Provides the length of the rolling history buffer
+ *  @return An int representing the length of the rolling history buffer
+ */
+-(int)rollingHistoryLength;
+
+#pragma mark - Clearing
+///-----------------------------------------------------------
+/// @name Clearing The Plot
+///-----------------------------------------------------------
+
+/**
+ Clears all data from the audio plot (includes both EZPlotTypeBuffer and EZPlotTypeRolling)
+ */
+-(void)clear;
+
+#pragma mark - Get Samples
+///-----------------------------------------------------------
+/// @name Updating The Plot
+///-----------------------------------------------------------
+/**
+ Updates the plot with the new buffer data and tells the view to redraw itself. Caller will provide a float array with the values they expect to see on the y-axis. The plot will internally handle mapping the x-axis and y-axis to the current view port, any interpolation for fills effects, and mirroring.
+ @param buffer     A float array of values to map to the y-axis.
+ @param bufferSize The size of the float array that will be mapped to the y-axis.
+ @warning The bufferSize is expected to be the same, constant value once initial triggered. For plots using OpenGL a vertex buffer object will be allocated with a maximum buffersize of (2 * the initial given buffer size) to account for any interpolation necessary for filling in the graph. Updates use the glBufferSubData(...) function, which will crash if the buffersize exceeds the initial maximum allocated size.
+ */
+-(void)updateBuffer:(float *)buffer
+     withBufferSize:(UInt32)bufferSize;
+
+@end
+
+#elif TARGET_OS_MAC
+#endif

EZAudio/EZAudioPlotGLKViewController.m

@@ -0,0 +1,486 @@
+//
+//  EZAudioPlotGLKViewController.m
+//  EZAudio
+//
+//  Created by Syed Haris Ali on 11/22/13.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+#if TARGET_OS_IPHONE
+
+#import "EZAudioPlotGLKViewController.h"
+#import "EZAudioUtilities.h"
+#import "EZAudioPlot.h"
+
+@interface EZAudioPlotGLKViewController () {
+  
+  // Flags indicating whether the plots have been instantiated
+  BOOL _hasBufferPlotData;
+  BOOL _hasRollingPlotData;
+  
+  // The buffers
+  GLuint _bufferPlotVBO;
+  GLuint _rollingPlotVBO;
+  
+  // Buffers size
+  UInt32 _bufferPlotGraphSize;
+  UInt32 _rollingPlotGraphSize;
+  
+  // Rolling History
+  BOOL    _setMaxLength;
+  float   *_scrollHistory;
+  int     _scrollHistoryIndex;
+  UInt32  _scrollHistoryLength;
+  BOOL    _changingHistorySize;
+  
+}
+@end
+
+@implementation EZAudioPlotGLKViewController
+@synthesize baseEffect   = _baseEffect;
+@synthesize context      = _context;
+@synthesize drawingType  = _drawingType;
+@synthesize plotType     = _plotType;
+@synthesize shouldMirror = _shouldMirror;
+
+#pragma mark - Initialization
+-(id)init
+{
+  self = [super init];
+  if (self) {
+    [self initializeView];
+  }
+  return self;
+}
+
+-(id)initWithCoder:(NSCoder *)aDecoder {
+  self = [super initWithCoder:aDecoder];
+  if(self){
+    [self initializeView];
+  }
+  return self;
+}
+
+-(id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+  self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+  if(self){
+    [self initializeView];
+  }
+  return self;
+  
+}
+#pragma mark - Initialize Properties Here
+-(void)initializeView {
+  // Setup the base effect
+  self.baseEffect = [[GLKBaseEffect alloc] init];
+  self.baseEffect.useConstantColor = GL_TRUE;
+  self.preferredFramesPerSecond = 60;
+  _scrollHistory       = NULL;
+  _scrollHistoryLength = kEZAudioPlotDefaultHistoryBufferLength;
+}
+
+#pragma mark - View Did Load
+-(void)viewDidLoad {
+  [super viewDidLoad];
+  
+  // Setup the context
+  if (![EAGLContext currentContext])
+  {
+    self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
+  }
+  else
+  {
+    self.context = [EAGLContext currentContext];
+  }
+  
+  if (!self.context) {
+    NSLog(@"Failed to create ES context");
+  }
+  else {
+    EAGLContext.currentContext = self.context;
+  }
+  
+  // Set the view's context
+  GLKView *view            = (GLKView *)self.view;
+  view.context             = self.context;
+  view.drawableMultisample = GLKViewDrawableMultisample4X;
+  view.opaque              = NO;
+  
+  // Generate both the buffer id references
+  glGenBuffers(1, &_bufferPlotVBO);
+  glGenBuffers(1, &_rollingPlotVBO);
+  
+  // Refresh color values
+  [self _refreshWithBackgroundColor: self.backgroundColor];
+  [self _refreshWithColor:           self.color];
+  
+  // Set the line width for the context
+  glLineWidth(2.0);
+  
+}
+
+#pragma mark - Adjust Resolution
+-(int)setRollingHistoryLength:(int)historyLength {
+  _changingHistorySize = YES;
+  historyLength = MIN(historyLength,kEZAudioPlotMaxHistoryBufferLength);
+  size_t floatByteSize = sizeof(float);
+  if (_scrollHistoryLength != historyLength){
+    _scrollHistoryLength = historyLength;
+  }
+  _scrollHistory = realloc(_scrollHistory,_scrollHistoryLength*floatByteSize);
+  if (_scrollHistoryIndex < _scrollHistoryLength){
+    memset(&_scrollHistory[_scrollHistoryIndex],
+           0,
+           (_scrollHistoryLength-_scrollHistoryIndex)*floatByteSize);
+  }
+  else {
+    _scrollHistoryIndex = _scrollHistoryLength;
+  }
+  [self _updateRollingPlotDisplay];
+  _changingHistorySize = NO;
+  return historyLength;
+}
+
+-(int)rollingHistoryLength {
+  return _scrollHistoryLength;
+}
+
+#pragma mark - Clearing
+-(void)clear
+{
+  _scrollHistoryIndex = 0;
+  [self _clearBufferPlot];
+  [self _clearRollingPlot];
+}
+
+-(void)_clearBufferPlot
+{
+  if (_hasBufferPlotData)
+  {
+    float empty[_bufferPlotGraphSize];
+    memset( empty, 0.0f, sizeof(float));
+    [self _updateBufferPlotBufferWithAudioReceived:empty
+                                    withBufferSize:_bufferPlotGraphSize];
+  }
+}
+
+-(void)_clearRollingPlot
+{
+  if (_hasRollingPlotData)
+  {
+    float              empty[_rollingPlotGraphSize];
+    EZAudioPlotGLPoint graph[_rollingPlotGraphSize];
+    // Figure out better way to do this
+    for(int i = 0; i < _rollingPlotGraphSize; i++)
+    {
+      empty[i] = 0.0f;
+    }
+    for(int i = 0; i < _scrollHistoryLength; i++)
+    {
+      _scrollHistory[i] = 0.0f;
+    }
+    // Update the scroll history datasource
+    [EZAudioUtilities updateScrollHistory:&_scrollHistory
+                      withLength:_scrollHistoryLength
+                         atIndex:&_scrollHistoryIndex
+                      withBuffer:empty
+                  withBufferSize:_rollingPlotGraphSize
+            isResolutionChanging:&_changingHistorySize];
+    // Fill in graph data
+    [EZAudioPlotGL fillGraph:graph
+               withGraphSize:_rollingPlotGraphSize
+              forDrawingType:_drawingType
+                  withBuffer:_scrollHistory
+              withBufferSize:_scrollHistoryLength
+                    withGain:self.gain];
+    // Update the drawing
+    glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(graph), graph);
+  }
+}
+
+#pragma mark - Get Samples
+-(void)updateBuffer:(float *)buffer
+     withBufferSize:(UInt32)bufferSize {
+  
+  // Make sure the update render loop is active
+  if (self.paused) self.paused = NO;
+  
+  // Make sure we are updating the buffers on the correct gl context.
+  EAGLContext.currentContext = self.context;
+  
+  // Draw based on plot type
+  switch(_plotType) {
+    case EZPlotTypeBuffer:
+      [self _updateBufferPlotBufferWithAudioReceived:buffer
+                                      withBufferSize:bufferSize];
+      break;
+    case EZPlotTypeRolling:
+      [self _updateRollingPlotBufferWithAudioReceived:buffer
+                                       withBufferSize:bufferSize];
+      break;
+    default:
+      break;
+  }
+  
+}
+
+#pragma mark - Buffer Updating By Type
+-(void)_updateBufferPlotBufferWithAudioReceived:(float*)buffer
+                                 withBufferSize:(UInt32)bufferSize {
+  
+  glBindBuffer(GL_ARRAY_BUFFER, _bufferPlotVBO);
+  
+  // If starting with a VBO of half of our max size make sure we initialize it to anticipate
+  // a filled graph (which needs 2 * bufferSize) to allocate its resources properly
+  if (!_hasBufferPlotData && _drawingType == EZAudioPlotGLDrawTypeLineStrip){
+    EZAudioPlotGLPoint maxGraph[2*bufferSize];
+    glBufferData(GL_ARRAY_BUFFER, sizeof(maxGraph), maxGraph, GL_STREAM_DRAW);
+    _hasBufferPlotData = YES;
+  }
+  
+  // Setup the buffer plot's graph size
+  _bufferPlotGraphSize = [EZAudioPlotGL graphSizeForDrawingType:_drawingType
+                                                  withBufferSize:bufferSize];
+  
+  // Setup the graph
+  EZAudioPlotGLPoint graph[_bufferPlotGraphSize];
+  
+  // Fill in graph data
+  [EZAudioPlotGL fillGraph:graph
+              withGraphSize:_bufferPlotGraphSize
+             forDrawingType:_drawingType
+                 withBuffer:buffer
+             withBufferSize:bufferSize
+                   withGain:self.gain];
+  
+  if (!_hasBufferPlotData){
+    glBufferData( GL_ARRAY_BUFFER, sizeof(graph), graph, GL_STREAM_DRAW);
+    _hasBufferPlotData = YES;
+  }
+  else {
+    glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(graph), graph);
+  }
+  
+  glBindBuffer(GL_ARRAY_BUFFER, 0);
+  
+}
+
+-(void)_updateRollingPlotBufferWithAudioReceived:(float*)buffer
+                                  withBufferSize:(UInt32)bufferSize {
+  
+  glBindBuffer(GL_ARRAY_BUFFER, _rollingPlotVBO);
+  
+  
+  
+  // If starting with a VBO of half of our max size make sure we initialize it to anticipate
+  // a filled graph (which needs 2 * bufferSize) to allocate its resources properly
+  if (!_hasRollingPlotData){
+    EZAudioPlotGLPoint maxGraph[2*kEZAudioPlotMaxHistoryBufferLength];
+    glBufferData( GL_ARRAY_BUFFER, sizeof(maxGraph), maxGraph, GL_STREAM_DRAW);
+    _hasRollingPlotData = YES;
+  }
+  
+  // Setup the plot
+  _rollingPlotGraphSize = [EZAudioPlotGL graphSizeForDrawingType:_drawingType
+                                                  withBufferSize:_scrollHistoryLength];
+  
+  // Fill the graph with data
+  EZAudioPlotGLPoint graph[_rollingPlotGraphSize];
+  
+  // Update the scroll history datasource
+  [EZAudioUtilities updateScrollHistory:&_scrollHistory
+                    withLength:_scrollHistoryLength
+                       atIndex:&_scrollHistoryIndex
+                    withBuffer:buffer
+                withBufferSize:bufferSize
+          isResolutionChanging:&_changingHistorySize];
+  
+  // Fill in graph data
+  [EZAudioPlotGL fillGraph:graph
+             withGraphSize:_rollingPlotGraphSize
+            forDrawingType:_drawingType
+                withBuffer:_scrollHistory
+            withBufferSize:_scrollHistoryLength
+                  withGain:self.gain];
+  
+  // Update the drawing
+  if (!_hasRollingPlotData){
+    glBufferData( GL_ARRAY_BUFFER, sizeof(graph) , graph, GL_STREAM_DRAW);
+    _hasRollingPlotData = YES;
+  }
+  else {
+    glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(graph), graph);
+  }
+  
+  glBindBuffer(GL_ARRAY_BUFFER, 0);
+  
+}
+
+-(void)_updateRollingPlotDisplay {
+  // Setup the plot
+  _rollingPlotGraphSize = [EZAudioPlotGL graphSizeForDrawingType:_drawingType
+                                                  withBufferSize:_scrollHistoryLength];
+  
+  // Fill the graph with data
+  EZAudioPlotGLPoint graph[_rollingPlotGraphSize];
+    
+  // Fill in graph data
+  [EZAudioPlotGL fillGraph:graph
+             withGraphSize:_rollingPlotGraphSize
+            forDrawingType:_drawingType
+                withBuffer:_scrollHistory
+            withBufferSize:_scrollHistoryLength
+                  withGain:self.gain];
+  
+  // Update the drawing
+  if (_hasRollingPlotData){
+    glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(graph), graph);
+  }
+}
+
+#pragma mark - Drawing
+-(void)glkView:(GLKView *)view drawInRect:(CGRect)rect {
+ 
+  EAGLContext.currentContext = self.context;
+ 
+  // Clear the context
+  glClear(GL_COLOR_BUFFER_BIT);
+  
+  if (_hasBufferPlotData || _hasRollingPlotData){
+    // Prepare the effect for drawing
+    [self.baseEffect prepareToDraw];
+    
+    // Plot either a buffer plot or a rolling plot
+    switch(_plotType) {
+      case EZPlotTypeBuffer:
+        [self _drawBufferPlotWithView:view
+                           drawInRect:rect];
+        break;
+      case EZPlotTypeRolling:
+        [self _drawRollingPlotWithView:view
+                            drawInRect:rect];
+        break;
+      default:
+        break;
+        
+    }
+  }
+}
+
+#pragma mark - Private Drawing
+-(void)_drawBufferPlotWithView:(GLKView*)view drawInRect:(CGRect)rect {
+  if (_hasBufferPlotData){
+    
+    glBindBuffer(GL_ARRAY_BUFFER, _bufferPlotVBO);
+    glEnableVertexAttribArray(GLKVertexAttribPosition);
+    glVertexAttribPointer(GLKVertexAttribPosition, 2, GL_FLOAT, GL_FALSE, sizeof(EZAudioPlotGLPoint), NULL);
+    
+    // Normal plot
+    
+    self.baseEffect.transform.modelviewMatrix = GLKMatrix4MakeXRotation(0);
+    glDrawArrays(_drawingType, 0, _bufferPlotGraphSize);
+    
+    
+    if (self.shouldMirror){
+      // Mirrored plot
+      [self.baseEffect prepareToDraw];
+      
+      self.baseEffect.transform.modelviewMatrix = GLKMatrix4MakeXRotation(M_PI);
+      glDrawArrays(_drawingType, 0, _bufferPlotGraphSize);
+      
+    }
+    
+    
+    glBindBuffer(GL_ARRAY_BUFFER,0);
+    
+  }
+}
+
+-(void)_drawRollingPlotWithView:(GLKView*)view drawInRect:(CGRect)rect {
+  if (_hasRollingPlotData){
+    
+    // Normal plot
+    glBindBuffer(GL_ARRAY_BUFFER, _rollingPlotVBO);
+    glEnableVertexAttribArray(GLKVertexAttribPosition);
+    glVertexAttribPointer(GLKVertexAttribPosition, 2, GL_FLOAT, GL_FALSE, sizeof(EZAudioPlotGLPoint), NULL);
+    
+    // Normal plot
+    
+    self.baseEffect.transform.modelviewMatrix = GLKMatrix4MakeXRotation(0);
+    glDrawArrays(_drawingType, 0, _rollingPlotGraphSize);
+    
+    
+    if (self.shouldMirror){
+      // Mirrored plot
+      [self.baseEffect prepareToDraw];
+      
+      self.baseEffect.transform.modelviewMatrix = GLKMatrix4MakeXRotation(3.14159265359);
+      glDrawArrays(_drawingType, 0, _rollingPlotGraphSize);
+      
+    }
+    
+    glBindBuffer(GL_ARRAY_BUFFER,0);
+    
+  }
+}
+
+#pragma mark - Setters
+-(void)setBackgroundColor:(UIColor *)backgroundColor {
+  // Set the background color
+  _backgroundColor = backgroundColor;
+  // Refresh background color (map to GL vector)
+  [self _refreshWithBackgroundColor:backgroundColor];
+}
+
+-(void)setColor:(UIColor *)color {
+  // Set the color
+  _color = color;
+  // Refresh the color (map to GL vector)
+  [self _refreshWithColor:color];
+}
+
+#pragma mark - Private Setters
+-(void)_refreshWithBackgroundColor:(UIColor*)backgroundColor {
+  // Extract colors
+  CGFloat red; CGFloat green; CGFloat blue; CGFloat alpha;
+  [backgroundColor getRed:&red
+                    green:&green
+                     blue:&blue
+                    alpha:&alpha];
+  // Set them on the context
+  glClearColor((GLclampf)red,(GLclampf)green,(GLclampf)blue,(GLclampf)alpha);
+}
+
+-(void)_refreshWithColor:(UIColor*)color {
+  // Extract colors
+  CGFloat red; CGFloat green; CGFloat blue; CGFloat alpha;
+  [color getRed:&red
+          green:&green
+           blue:&blue
+          alpha:&alpha];
+  // Set them on the base shader
+  self.baseEffect.constantColor = GLKVector4Make((GLclampf)red,(GLclampf)green,(GLclampf)blue,(GLclampf)alpha);
+}
+
+@end
+
+#elif TARGET_OS_MAC
+
+#endif

EZAudio/EZAudioUtilities.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 6/23/15.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -25,47 +25,7 @@
 
 #import <Foundation/Foundation.h>
 #import <AudioToolbox/AudioToolbox.h>
-#import <TargetConditionals.h>
 #import "TPCircularBuffer.h"
-#if TARGET_OS_IPHONE
-#import <AVFoundation/AVFoundation.h>
-#elif TARGET_OS_MAC
-#endif
-
-//------------------------------------------------------------------------------
-#pragma mark - Data Structures
-//------------------------------------------------------------------------------
-
-/**
- A data structure that holds information about audio data over time. It contains a circular buffer to incrementally write the audio data to and a scratch buffer to hold a window of audio data relative to the whole circular buffer. In use, this will provide a way to continuously append data while having an adjustable viewable window described by the bufferSize.
- */
-typedef struct
-{
-    float            *buffer;
-    int               bufferSize;
-    TPCircularBuffer  circularBuffer;
-} EZPlotHistoryInfo;
-
-//------------------------------------------------------------------------------
-
-/**
- A data structure that holds information about a node in the context of an AUGraph.
- */
-typedef struct
-{
-    AudioUnit audioUnit;
-    AUNode    node;
-} EZAudioNodeInfo;
-
-//------------------------------------------------------------------------------
-#pragma mark - Types
-//------------------------------------------------------------------------------
-
-#if TARGET_OS_IPHONE
-typedef CGRect EZRect;
-#elif TARGET_OS_MAC
-typedef NSRect EZRect;
-#endif
 
 //------------------------------------------------------------------------------
 #pragma mark - EZAudioUtilities
@@ -404,28 +364,6 @@ typedef NSRect EZRect;
  */
 + (NSString *)stringFromUInt32Code:(UInt32)code;
 
-//------------------------------------------------------------------------------
-#pragma mark - Color Utility
-//------------------------------------------------------------------------------
-
-///-----------------------------------------------------------
-/// @name Color Utility
-///-----------------------------------------------------------
-
-/**
- Helper function to get the color components from a CGColorRef in the RGBA colorspace.
- @param color A CGColorRef that represents a color.
- @param red   A pointer to a CGFloat to hold the value of the red component. This value will be between 0 and 1.
- @param green A pointer to a CGFloat to hold the value of the green component. This value will be between 0 and 1.
- @param blue  A pointer to a CGFloat to hold the value of the blue component. This value will be between 0 and 1.
- @param alpha A pointer to a CGFloat to hold the value of the alpha component. This value will be between 0 and 1.
- */
-+ (void)getColorComponentsFromCGColor:(CGColorRef)color
-                                  red:(CGFloat *)red
-                                green:(CGFloat *)green
-                                 blue:(CGFloat *)blue
-                                alpha:(CGFloat *)alpha;
-
 //------------------------------------------------------------------------------
 #pragma mark - Plot Utility
 //------------------------------------------------------------------------------
@@ -484,47 +422,6 @@ typedef NSRect EZRect;
  */
 + (void)freeCircularBuffer:(TPCircularBuffer*)circularBuffer;
 
-//------------------------------------------------------------------------------
-#pragma mark - EZPlotHistoryInfo Utility
-//------------------------------------------------------------------------------
-
-/**
- Calculates the RMS of a float array containing audio data and appends it to the tail of a EZPlotHistoryInfo data structure. Thread-safe.
- @param buffer      A float array containing the incoming audio buffer to append to the history buffer
- @param bufferSize  A UInt32 representing the length of the incoming audio buffer
- @param historyInfo A pointer to a EZPlotHistoryInfo structure to use for managing the history buffers
- */
-+ (void)appendBuffer:(float *)buffer
-      withBufferSize:(UInt32)bufferSize
-       toHistoryInfo:(EZPlotHistoryInfo *)historyInfo;
-
-//------------------------------------------------------------------------------
-
-/**
- Zeroes out a EZPlotHistoryInfo data structure without freeing the resources.
- @param historyInfo A pointer to a EZPlotHistoryInfo data structure
- */
-+ (void)clearHistoryInfo:(EZPlotHistoryInfo *)historyInfo;
-
-//------------------------------------------------------------------------------
-
-/**
- Frees a EZPlotHistoryInfo data structure
- @param historyInfo A pointer to a EZPlotHistoryInfo data structure
- */
-+ (void)freeHistoryInfo:(EZPlotHistoryInfo *)historyInfo;
-
-//------------------------------------------------------------------------------
-
-/**
- Creates an EZPlotHistoryInfo data structure with a default length for the window buffer and a maximum length capacity for the internal circular buffer that holds all the audio data.
- @param defaultLength An int representing the default length (i.e. the number of points that will be displayed on screen) of the history window.
- @param maximumLength An int representing the default maximum length that is the absolute maximum amount of values that can be held in the history's circular buffer.
- @return A pointer to the EZPlotHistoryInfo created. The caller is responsible for freeing this structure using the `freeHistoryInfo` method above.
- */
-+ (EZPlotHistoryInfo *)historyInfoWithDefaultLength:(int)defaultLength
-                                      maximumLength:(int)maximumLength;
-
 //------------------------------------------------------------------------------
 
 @end

EZAudio/EZAudioUtilities.m

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 6/23/15.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -61,7 +61,6 @@ BOOL __shouldExitOnCheckResultFail = YES;
         audioBufferList->mBuffers[i].mNumberChannels = channels;
         audioBufferList->mBuffers[i].mDataByteSize = channels * outputBufferSize;
         audioBufferList->mBuffers[i].mData = (float *)malloc(channels * sizeof(float) *outputBufferSize);
-        memset(audioBufferList->mBuffers[i].mData, 0, frames);
     }
     return audioBufferList;
 }
@@ -150,7 +149,7 @@ BOOL __shouldExitOnCheckResultFail = YES;
                                                          NULL,
                                                          &propSize,
                                                          &asbd)
-                        operation:"Failed to fill out the rest of the iLBC AudioStreamBasicDescription"];
+                        operation:"Failed to fill out the rest of the m4a AudioStreamBasicDescription"];
     
     return asbd;
 }
@@ -534,31 +533,6 @@ BOOL __shouldExitOnCheckResultFail = YES;
     }
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Color Utility
-//------------------------------------------------------------------------------
-
-///-----------------------------------------------------------
-/// @name Color Utility
-///-----------------------------------------------------------
-
-+ (void)getColorComponentsFromCGColor:(CGColorRef)color
-                                  red:(CGFloat *)red
-                                green:(CGFloat *)green
-                                 blue:(CGFloat *)blue
-                                alpha:(CGFloat *)alpha
-{
-    size_t componentCount = CGColorGetNumberOfComponents(color);
-    if (componentCount == 4)
-    {
-        const CGFloat *components = CGColorGetComponents(color);
-        *red = components[0];
-        *green = components[1];
-        *blue = components[2];
-        *alpha = components[3];
-    }
-}
-
 //------------------------------------------------------------------------------
 #pragma mark - TPCircularBuffer Utility
 //------------------------------------------------------------------------------
@@ -586,82 +560,6 @@ BOOL __shouldExitOnCheckResultFail = YES;
     TPCircularBufferCleanup(circularBuffer);
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - EZPlotHistoryInfo Utility
-//------------------------------------------------------------------------------
-
-+ (void)appendBuffer:(float *)buffer
-      withBufferSize:(UInt32)bufferSize
-       toHistoryInfo:(EZPlotHistoryInfo *)historyInfo
-{
-    //
-    // Do nothing if there is no buffer
-    //
-    if (bufferSize == 0)
-    {
-        return;
-    }
-    
-    //
-    // Update the scroll history datasource
-    //
-    float rms = [EZAudioUtilities RMS:buffer length:bufferSize];
-    float src[1];
-    src[0] = isnan(rms) ? 0.0 : rms;
-    TPCircularBufferProduceBytes(&historyInfo->circularBuffer, src, sizeof(src));
-    int32_t targetBytes = historyInfo->bufferSize * sizeof(float);
-    int32_t availableBytes = 0;
-    float *historyBuffer = TPCircularBufferTail(&historyInfo->circularBuffer, &availableBytes);
-    int32_t bytes = MIN(targetBytes, availableBytes);
-    memmove(historyInfo->buffer, historyBuffer, bytes);
-    if (targetBytes <= availableBytes)
-    {
-        TPCircularBufferConsume(&historyInfo->circularBuffer, availableBytes - targetBytes);
-    }
-}
-
-//------------------------------------------------------------------------------
-
-+ (void)clearHistoryInfo:(EZPlotHistoryInfo *)historyInfo
-{
-    memset(historyInfo->buffer, 0, historyInfo->bufferSize * sizeof(float));
-    TPCircularBufferClear(&historyInfo->circularBuffer);
-}
-
-//------------------------------------------------------------------------------
-
-+ (void)freeHistoryInfo:(EZPlotHistoryInfo *)historyInfo
-{
-    free(historyInfo->buffer);
-    free(historyInfo);
-    TPCircularBufferCleanup(&historyInfo->circularBuffer);
-}
-
-//------------------------------------------------------------------------------
-
-+ (EZPlotHistoryInfo *)historyInfoWithDefaultLength:(int)defaultLength
-                                      maximumLength:(int)maximumLength
-{
-    //
-    // Setup buffers
-    //
-    EZPlotHistoryInfo *historyInfo = (EZPlotHistoryInfo *)malloc(sizeof(EZPlotHistoryInfo));
-    historyInfo->bufferSize = defaultLength;
-    historyInfo->buffer = calloc(maximumLength, sizeof(float));
-    TPCircularBufferInit(&historyInfo->circularBuffer, maximumLength);
-    
-    //
-    // Zero out circular buffer
-    //
-    float emptyBuffer[maximumLength];
-    memset(emptyBuffer, 0, sizeof(emptyBuffer));
-    TPCircularBufferProduceBytes(&historyInfo->circularBuffer,
-                                 emptyBuffer,
-                                 (int32_t)sizeof(emptyBuffer));
-    
-    return historyInfo;
-}
-
 //------------------------------------------------------------------------------
 
 @end

EZAudio/EZMicrophone.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 9/2/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -36,7 +36,7 @@
 //------------------------------------------------------------------------------
 
 /**
- The EZMicrophoneDelegate for the EZMicrophone provides a receiver for the incoming audio data events. When the microphone has been successfully internally configured it will try to send its delegate an AudioStreamBasicDescription describing the format of the incoming audio data. 
+ The delegate for the EZMicrophone provides a receiver for the incoming audio data events. When the microphone has been successfully internally configured it will try to send its delegate an AudioStreamBasicDescription describing the format of the incoming audio data. 
  
  The audio data itself is sent back to the delegate in various forms:
  
@@ -55,18 +55,10 @@
 ///-----------------------------------------------------------
 
 /**
- Called anytime the EZMicrophone starts or stops.
- @param output The instance of the EZMicrophone that triggered the event.
- @param isPlaying A BOOL indicating whether the EZMicrophone instance is playing or not.
- */
-- (void)microphone:(EZMicrophone *)microphone changedPlayingState:(BOOL)isPlaying;
-
-//------------------------------------------------------------------------------
-
-/**
- Called anytime the input device changes on an `EZMicrophone` instance.
+ Called anytime the input device changes on an `EZMicrophone` instance. Mac only.
  @param microphone The instance of the EZMicrophone that triggered the event.
  @param device The instance of the new EZAudioDevice the microphone is using to pull input.
+ @param notification Incase the device changed because of a notification (like from AVAudioSession) then we provide that notification to give the full context of the change.
  */
 - (void)microphone:(EZMicrophone *)microphone changedDevice:(EZAudioDevice *)device;
 
@@ -85,7 +77,7 @@
 ///-----------------------------------------------------------
 
 /**
- This method provides an array of float arrays of the audio received, each float array representing a channel of audio data This occurs on the background thread so any drawing code must explicity perform its functions on the main thread.
+ Returns back a float array of the audio received. This occurs on the background thread so any drawing code must explicity perform its functions on the main thread.
  @param microphone       The instance of the EZMicrophone that triggered the event.
  @param buffer           The audio data as an array of float arrays. In a stereo signal buffer[0] represents the left channel while buffer[1] would represent the right channel.
  @param bufferSize       The size of each of the buffers (the length of each float array).
@@ -312,9 +304,7 @@
  */
 - (AudioUnit *)audioUnit;
 
-//------------------------------------------------------------------------------
 #pragma mark - Setters
-//------------------------------------------------------------------------------
 
 ///-----------------------------------------------------------
 /// @name Customizing The Microphone Stream Format

EZAudio/EZMicrophone.m

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 9/2/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -41,17 +41,6 @@ typedef struct EZMicrophoneInfo
     AudioStreamBasicDescription   streamFormat;
 } EZMicrophoneInfo;
 
-//------------------------------------------------------------------------------
-#pragma mark - Callbacks
-//------------------------------------------------------------------------------
-
-static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
-                                          AudioUnitRenderActionFlags *ioActionFlags,
-                                          const AudioTimeStamp       *inTimeStamp,
-                                          UInt32                      inBusNumber,
-                                          UInt32                      inNumberFrames,
-                                          AudioBufferList            *ioData);
-
 //------------------------------------------------------------------------------
 #pragma mark - EZMicrophone (Interface Extension)
 //------------------------------------------------------------------------------
@@ -70,14 +59,60 @@ static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    [EZAudioUtilities checkResult:AudioUnitUninitialize(self.info->audioUnit)
-                        operation:"Failed to unintialize audio unit for microphone"];
+    [EZAudioUtilities checkResult:AudioUnitUninitialize(self.info->audioUnit) operation:"Failed to unintialize audio unit for microphone"];
     [EZAudioUtilities freeBufferList:self.info->audioBufferList];
     [EZAudioUtilities freeFloatBuffers:self.info->floatData
                       numberOfChannels:self.info->streamFormat.mChannelsPerFrame];
     free(self.info);
 }
 
+//------------------------------------------------------------------------------
+#pragma mark - Callbacks
+//------------------------------------------------------------------------------
+
+static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
+                                          AudioUnitRenderActionFlags *ioActionFlags,
+                                          const AudioTimeStamp       *inTimeStamp,
+                                          UInt32                     inBusNumber,
+                                          UInt32                     inNumberFrames,
+                                          AudioBufferList            *ioData)
+{
+    EZMicrophone *microphone = (__bridge EZMicrophone *)inRefCon;
+    EZMicrophoneInfo *info = (EZMicrophoneInfo *)microphone.info;
+    
+    // render audio into buffer
+    OSStatus result = AudioUnitRender(info->audioUnit,
+                                      ioActionFlags,
+                                      inTimeStamp,
+                                      inBusNumber,
+                                      inNumberFrames,
+                                      info->audioBufferList);
+    
+    // notify delegate of new buffer list to process
+    if ([microphone.delegate respondsToSelector:@selector(microphone:hasBufferList:withBufferSize:withNumberOfChannels:)])
+    {
+        [microphone.delegate microphone:microphone
+                          hasBufferList:info->audioBufferList
+                         withBufferSize:inNumberFrames
+                   withNumberOfChannels:info->streamFormat.mChannelsPerFrame];
+    }
+    
+    // notify delegate of new float data processed
+    if ([microphone.delegate respondsToSelector:@selector(microphone:hasAudioReceived:withBufferSize:withNumberOfChannels:)])
+    {
+        // convert to float
+        [microphone.floatConverter convertDataFromAudioBufferList:info->audioBufferList
+                                               withNumberOfFrames:inNumberFrames
+                                                   toFloatBuffers:info->floatData];
+        [microphone.delegate microphone:microphone
+                       hasAudioReceived:info->floatData
+                         withBufferSize:inNumberFrames
+                   withNumberOfChannels:info->streamFormat.mChannelsPerFrame];
+    }
+    
+    return result;
+}
+
 //------------------------------------------------------------------------------
 #pragma mark - Initialization
 //------------------------------------------------------------------------------
@@ -117,7 +152,11 @@ static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
     self = [self initWithMicrophoneDelegate:delegate];
     if(self)
     {
-        [self setAudioStreamBasicDescription:audioStreamBasicDescription];
+        self.info = (EZMicrophoneInfo *)malloc(sizeof(EZMicrophoneInfo));
+        memset(self.info, 0, sizeof(EZMicrophoneInfo));
+        self.info->streamFormat = audioStreamBasicDescription;
+        _delegate = delegate;
+        [self setup];
     }
     return self;
 }
@@ -236,8 +275,13 @@ static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
                                                        &flag,
                                                        sizeof(flag))
                         operation:"Couldn't enable input on remote IO unit."];
+    EZAudioDevice *currentInputDevice = [EZAudioDevice currentInputDevice];
+    [self setDevice:currentInputDevice];
+#elif TARGET_OS_MAC
+    NSArray *inputDevices = [EZAudioDevice inputDevices];
+    EZAudioDevice *defaultMicrophone = [inputDevices lastObject];
+    [self setDevice:defaultMicrophone];
 #endif
-    [self setDevice:[EZAudioDevice currentInputDevice]];
     
     UInt32 propSize = sizeof(self.info->inputFormat);
     [EZAudioUtilities checkResult:AudioUnitGetProperty(self.info->audioUnit,
@@ -252,7 +296,11 @@ static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
     NSAssert(self.info->inputFormat.mSampleRate, @"Expected AVAudioSession sample rate to be greater than 0.0. Did you setup the audio session?");
 #elif TARGET_OS_MAC
 #endif
-    [self setAudioStreamBasicDescription:[self defaultStreamFormat]];
+    if (self.info->streamFormat.mSampleRate == 0.0)
+    {
+        self.info->streamFormat = [self defaultStreamFormat];
+    }
+    [self setAudioStreamBasicDescription:self.info->streamFormat];
     
     // render callback
     AURenderCallbackStruct renderCallbackStruct;
@@ -337,38 +385,16 @@ static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
 
 -(void)startFetchingAudio
 {
-    //
-    // Start output unit
-    //
     [EZAudioUtilities checkResult:AudioOutputUnitStart(self.info->audioUnit)
                         operation:"Failed to start microphone audio unit"];
-    
-    //
-    // Notify delegate
-    //
-    if ([self.delegate respondsToSelector:@selector(microphone:changedPlayingState:)])
-    {
-        [self.delegate microphone:self changedPlayingState:YES];
-    }
 }
 
 //------------------------------------------------------------------------------
 
 -(void)stopFetchingAudio
 {
-    //
-    // Stop output unit
-    //
     [EZAudioUtilities checkResult:AudioOutputUnitStop(self.info->audioUnit)
                         operation:"Failed to stop microphone audio unit"];
-    
-    //
-    // Notify delegate
-    //
-    if ([self.delegate respondsToSelector:@selector(microphone:changedPlayingState:)])
-    {
-        [self.delegate microphone:self changedPlayingState:NO];
-    }
 }
 
 //------------------------------------------------------------------------------
@@ -545,23 +571,21 @@ static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
 - (void)setOutput:(EZOutput *)output
 {
     _output = output;
-    _output.inputFormat = self.audioStreamBasicDescription;
-    _output.dataSource = self;
+    [_output setAudioStreamBasicDescription:self.audioStreamBasicDescription];
+    _output.outputDataSource = self;
 }
 
 //------------------------------------------------------------------------------
 #pragma mark - EZOutputDataSource
 //------------------------------------------------------------------------------
 
-- (OSStatus)        output:(EZOutput *)output
+- (void)            output:(EZOutput *)output
  shouldFillAudioBufferList:(AudioBufferList *)audioBufferList
         withNumberOfFrames:(UInt32)frames
-                 timestamp:(const AudioTimeStamp *)timestamp
 {
     memcpy(audioBufferList,
            self.info->audioBufferList,
            sizeof(AudioBufferList) + (self.info->audioBufferList->mNumberBuffers - 1)*sizeof(AudioBuffer));
-    return noErr;
 }
 
 //------------------------------------------------------------------------------
@@ -578,60 +602,9 @@ static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
 
 - (UInt32)numberOfChannels
 {
-#if TARGET_OS_IPHONE
     return 1;
-#elif TARGET_OS_MAC
-    return (UInt32)self.device.inputChannelCount;
-#endif
 }
 
 //------------------------------------------------------------------------------
 
-@end
-
-//------------------------------------------------------------------------------
-#pragma mark - Callbacks
-//------------------------------------------------------------------------------
-
-static OSStatus EZAudioMicrophoneCallback(void                       *inRefCon,
-                                          AudioUnitRenderActionFlags *ioActionFlags,
-                                          const AudioTimeStamp       *inTimeStamp,
-                                          UInt32                      inBusNumber,
-                                          UInt32                      inNumberFrames,
-                                          AudioBufferList            *ioData)
-{
-    EZMicrophone *microphone = (__bridge EZMicrophone *)inRefCon;
-    EZMicrophoneInfo *info = (EZMicrophoneInfo *)microphone.info;
-    
-    // render audio into buffer
-    OSStatus result = AudioUnitRender(info->audioUnit,
-                                      ioActionFlags,
-                                      inTimeStamp,
-                                      inBusNumber,
-                                      inNumberFrames,
-                                      info->audioBufferList);
-    
-    // notify delegate of new buffer list to process
-    if ([microphone.delegate respondsToSelector:@selector(microphone:hasBufferList:withBufferSize:withNumberOfChannels:)])
-    {
-        [microphone.delegate microphone:microphone
-                          hasBufferList:info->audioBufferList
-                         withBufferSize:inNumberFrames
-                   withNumberOfChannels:info->streamFormat.mChannelsPerFrame];
-    }
-    
-    // notify delegate of new float data processed
-    if ([microphone.delegate respondsToSelector:@selector(microphone:hasAudioReceived:withBufferSize:withNumberOfChannels:)])
-    {
-        // convert to float
-        [microphone.floatConverter convertDataFromAudioBufferList:info->audioBufferList
-                                               withNumberOfFrames:inNumberFrames
-                                                   toFloatBuffers:info->floatData];
-        [microphone.delegate microphone:microphone
-                       hasAudioReceived:info->floatData
-                         withBufferSize:inNumberFrames
-                   withNumberOfChannels:info->streamFormat.mChannelsPerFrame];
-    }
-    
-    return result;
-}
+@end

EZAudio/EZOutput.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 12/2/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -30,102 +30,72 @@
 #import <AudioUnit/AudioUnit.h>
 #endif
 
-@class EZAudioDevice;
+#import "TPCircularBuffer.h"
+
 @class EZOutput;
 
-//------------------------------------------------------------------------------
-#pragma mark - Constants
-//------------------------------------------------------------------------------
-
-FOUNDATION_EXPORT UInt32  const EZOutputMaximumFramesPerSlice;
-FOUNDATION_EXPORT Float64 const EZOutputDefaultSampleRate;
-
-//------------------------------------------------------------------------------
-#pragma mark - EZOutputDataSource
-//------------------------------------------------------------------------------
-
 /**
- The EZOutputDataSource specifies a receiver to provide audio data when the EZOutput is started. Since the 0.4.0 release this has been simplified to only one data source method.
+ The EZOutputDataSource (required for the EZOutput) specifies a receiver to provide audio data when the EZOutput is started. Only ONE datasource method is expected to be implemented and priority is given as such:
+   1.) `output:callbackWithActionFlags:inTimeStamp:inBusNumber:inNumberFrames:ioData:`
+   2.) `outputShouldUseCircularBuffer:`
+   3.) `output:needsBufferListWithFrames:withBufferSize:`
  */
 @protocol EZOutputDataSource <NSObject>
 
 @optional
 ///-----------------------------------------------------------
-/// @name Providing Audio Data
+/// @name Pulling The Audio Data
 ///-----------------------------------------------------------
 
-@required
+/**
+ Provides complete override of the output callback function. The delegate is expected to
+ @param output         The instance of the EZOutput that asked for the data
+ @param ioActionFlags  AudioUnitRenderActionFlags provided by the output callback
+ @param inTimeStamp    AudioTimeStamp reference provided by the output callback
+ @param inBusNumber    UInt32 representing the bus number provided by the output callback
+ @param inNumberFrames UInt32 representing the number of frames provided by the output callback
+ @param ioData         AudioBufferList pointer representing the audio data that will be used for output provided by the output callback (fill this!)
+ */
+-(void)output:(EZOutput*)output
+callbackWithActionFlags:(AudioUnitRenderActionFlags*)ioActionFlags
+  inTimeStamp:(const AudioTimeStamp*)inTimeStamp
+  inBusNumber:(UInt32)inBusNumber
+inNumberFrames:(UInt32)inNumberFrames
+       ioData:(AudioBufferList*)ioData;
 
 /**
- Provides a way to provide output with data anytime the EZOutput needs audio data to play. This function provides an already allocated AudioBufferList to use for providing audio data into the output buffer. The expected format of the audio data provided here is specified by the EZOutput `inputFormat` property. This audio data will be converted into the client format specified by the EZOutput `clientFormat` property.
+ Provides output using a circular
+ @param output The instance of the EZOutput that asked for the data
+ @return The EZOutputDataSource's TPCircularBuffer structure holding the audio data in a circular buffer
+ */
+-(TPCircularBuffer*)outputShouldUseCircularBuffer:(EZOutput *)output;
+
+
+/**
+ Provides a way to provide output with data anytime the EZOutput needs audio data to play. This function provides an already allocated AudioBufferList to use for providing audio data into the output buffer.
  @param output The instance of the EZOutput that asked for the data.
  @param audioBufferList The AudioBufferList structure pointer that needs to be filled with audio data
  @param frames The amount of frames as a UInt32 that output will need to properly fill its output buffer.
- @param timestamp A AudioTimeStamp pointer to use if you need the current host time.
- @return An OSStatus code. If there was no error then use the noErr status code.
+ @return A pointer to the AudioBufferList structure holding the audio data. If nil or NULL, will output silence.
  */
-- (OSStatus)        output:(EZOutput *)output
- shouldFillAudioBufferList:(AudioBufferList *)audioBufferList
-        withNumberOfFrames:(UInt32)frames
-                 timestamp:(const AudioTimeStamp *)timestamp;
-
-@end
-
-//------------------------------------------------------------------------------
-#pragma mark - EZOutputDelegate
-//------------------------------------------------------------------------------
-
-/**
- The EZOutputDelegate for the EZOutput component provides a receiver to handle play state, device, and audio data change events. This is very similar to the EZMicrophoneDelegate for the EZMicrophone and the EZAudioFileDelegate for the EZAudioFile.
- */
-@protocol EZOutputDelegate <NSObject>
-
-@optional
-
-/**
- Called anytime the EZOutput starts or stops.
- @param output The instance of the EZOutput that triggered the event.
- @param isPlaying A BOOL indicating whether the EZOutput instance is playing or not.
- */
-- (void)output:(EZOutput *)output changedPlayingState:(BOOL)isPlaying;
-
-//------------------------------------------------------------------------------
-
-/**
- Called anytime the `device` changes on an EZOutput instance.
- @param output The instance of the EZOutput that triggered the event.
- @param device The instance of the new EZAudioDevice the output is using to play audio data.
- */
-- (void)output:(EZOutput *)output changedDevice:(EZAudioDevice *)device;
-
-//------------------------------------------------------------------------------
-
-/**
- Like the EZMicrophoneDelegate, for the EZOutput this method provides an array of float arrays of the audio received, each float array representing a channel of audio data. This occurs on the background thread so any drawing code must explicity perform its functions on the main thread.
- @param output The instance of the EZOutput that triggered the event.
- @param buffer           The audio data as an array of float arrays. In a stereo signal buffer[0] represents the left channel while buffer[1] would represent the right channel.
- @param bufferSize       A UInt32 representing the size of each of the buffers (the length of each float array).
- @param numberOfChannels A UInt32 representing the number of channels (you can use this to know how many float arrays are in the `buffer` parameter.
- @warning This function executes on a background thread to avoid blocking any audio operations. If operations should be performed on any other thread (like the main thread) it should be performed within a dispatch block like so: dispatch_async(dispatch_get_main_queue(), ^{ ...Your Code... })
- */
-- (void)       output:(EZOutput *)output
-          playedAudio:(float **)buffer
-       withBufferSize:(UInt32)bufferSize
- withNumberOfChannels:(UInt32)numberOfChannels;
-
-//------------------------------------------------------------------------------
+-(void)             output:(EZOutput *)output
+ shouldFillAudioBufferList:(AudioBufferList*)audioBufferList
+        withNumberOfFrames:(UInt32)frames;
 
 @end
 
 /**
- The EZOutput component provides a generic output to glue all the other EZAudio components together and push whatever sound you've created to the default output device (think opposite of the microphone). The EZOutputDataSource provides the required AudioBufferList needed to populate the output buffer while the EZOutputDelegate provides the same kind of mechanism as the EZMicrophoneDelegate or EZAudioFileDelegate in that you will receive a callback that provides non-interleaved, float data for visualizing the output (done using an internal float converter). As of 0.4.0 the EZOutput has been simplified to a single EZOutputDataSource method and now uses an AUGraph to provide format conversion from the `inputFormat` to the playback graph's `clientFormat` linear PCM formats, mixer controls for setting volume and pan settings, hooks to add in any number of effect audio units (see the `connectOutputOfSourceNode:sourceNodeOutputBus:toDestinationNode:destinationNodeInputBus:inGraph:` subclass method), and hardware device toggling (via EZAudioDevice).
+ The EZOutput component provides a generic output to glue all the other EZAudio components together and push whatever sound you've created to the default output device (think opposite of the microphone). The EZOutputDataSource provides the required AudioBufferList needed to populate the output buffer.
  */
 @interface EZOutput : NSObject
 
-//------------------------------------------------------------------------------
-#pragma mark - Initializers
-//------------------------------------------------------------------------------
+#pragma mark - Properties
+/**
+ The EZOutputDataSource that provides the required AudioBufferList to the output callback function
+ */
+@property (nonatomic,assign) id<EZOutputDataSource>outputDataSource;
 
+#pragma mark - Initializers
 ///-----------------------------------------------------------
 /// @name Initializers
 ///-----------------------------------------------------------
@@ -135,38 +105,29 @@ FOUNDATION_EXPORT Float64 const EZOutputDefaultSampleRate;
  @param dataSource The EZOutputDataSource that will be used to pull the audio data for the output callback.
  @return A newly created instance of the EZOutput class.
  */
-- (instancetype)initWithDataSource:(id<EZOutputDataSource>)dataSource;
+-(id)initWithDataSource:(id<EZOutputDataSource>)dataSource;
 
 /**
  Creates a new instance of the EZOutput and allows the caller to specify an EZOutputDataSource.
  @param dataSource The EZOutputDataSource that will be used to pull the audio data for the output callback.
- @param inputFormat The AudioStreamBasicDescription of the EZOutput.
- @warning AudioStreamBasicDescription input formats must be linear PCM!
+ @param audioStreamBasicDescription The AudioStreamBasicDescription of the EZOutput.
+ @warning AudioStreamBasicDescriptions that are invalid will cause the EZOutput to fail to initialize
  @return A newly created instance of the EZOutput class.
  */
-- (instancetype)initWithDataSource:(id<EZOutputDataSource>)dataSource
-                       inputFormat:(AudioStreamBasicDescription)inputFormat;
+-(id)         initWithDataSource:(id<EZOutputDataSource>)dataSource
+ withAudioStreamBasicDescription:(AudioStreamBasicDescription)audioStreamBasicDescription;
 
-//------------------------------------------------------------------------------
 #pragma mark - Class Initializers
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Class Initializers
 ///-----------------------------------------------------------
 
-/**
- Class method to create a new instance of the EZOutput
- @return A newly created instance of the EZOutput class.
- */
-+ (instancetype)output;
-
 /**
  Class method to create a new instance of the EZOutput and allows the caller to specify an EZOutputDataSource.
  @param dataSource The EZOutputDataSource that will be used to pull the audio data for the output callback.
  @return A newly created instance of the EZOutput class.
  */
-+ (instancetype)outputWithDataSource:(id<EZOutputDataSource>)dataSource;
++(EZOutput*)outputWithDataSource:(id<EZOutputDataSource>)dataSource;
 
 /**
  Class method to create a new instance of the EZOutput and allows the caller to specify an EZOutputDataSource.
@@ -175,13 +136,10 @@ FOUNDATION_EXPORT Float64 const EZOutputDefaultSampleRate;
  @warning AudioStreamBasicDescriptions that are invalid will cause the EZOutput to fail to initialize
  @return A newly created instance of the EZOutput class.
  */
-+ (instancetype)outputWithDataSource:(id<EZOutputDataSource>)dataSource
-                         inputFormat:(AudioStreamBasicDescription)inputFormat;
++(EZOutput*)outputWithDataSource:(id<EZOutputDataSource>)dataSource
+ withAudioStreamBasicDescription:(AudioStreamBasicDescription)audioStreamBasicDescription;
 
-//------------------------------------------------------------------------------
 #pragma mark - Singleton
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Shared Instance
 ///-----------------------------------------------------------
@@ -190,123 +148,9 @@ FOUNDATION_EXPORT Float64 const EZOutputDefaultSampleRate;
  Creates a shared instance of the EZOutput (one app will usually only need one output and share the role of the EZOutputDataSource).
  @return The shared instance of the EZOutput class.
  */
-+ (instancetype)sharedOutput;
-
-//------------------------------------------------------------------------------
-#pragma mark - Properties
-//------------------------------------------------------------------------------
-
-///-----------------------------------------------------------
-/// @name Setting/Getting The Stream Formats
-///-----------------------------------------------------------
-
-/**
- Provides the AudioStreamBasicDescription structure used at the beginning of the playback graph which is then converted into the `clientFormat` using the AUConverter audio unit.
-  @warning The AudioStreamBasicDescription set here must be linear PCM. Compressed formats are not supported...the EZAudioFile's clientFormat performs the audio conversion on the fly from compressed to linear PCM so there is no additional work to be done there.
- @return An AudioStreamBasicDescription structure describing
- */
-@property (nonatomic, readwrite) AudioStreamBasicDescription inputFormat;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the AudioStreamBasicDescription structure that serves as the common format used throughout the playback graph (similar to how the EZAudioFile as a clientFormat that is linear PCM to be shared amongst other components). The `inputFormat` is converted into this format at the beginning of the playback graph using an AUConverter audio unit. Defaults to the whatever the `defaultClientFormat` method returns is if a custom one isn't explicitly set.
- @warning The AudioStreamBasicDescription set here must be linear PCM. Compressed formats are not supported by Audio Units.
- @return An AudioStreamBasicDescription structure describing the common client format for the playback graph.
- */
-@property (nonatomic, readwrite) AudioStreamBasicDescription clientFormat;
-
-//------------------------------------------------------------------------------
-
-///-----------------------------------------------------------
-/// @name Setting/Getting The Data Source and Delegate
-///-----------------------------------------------------------
-
-/**
- The EZOutputDataSource that provides the audio data in the `inputFormat` for the EZOutput to play. If an EZOutputDataSource is not specified then the EZOutput will just output silence.
- */
-@property (nonatomic, weak) id<EZOutputDataSource> dataSource;
-
-//------------------------------------------------------------------------------
-
-/**
- The EZOutputDelegate for which to handle the output callbacks
- */
-@property (nonatomic, weak) id<EZOutputDelegate> delegate;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides a flag indicating whether the EZOutput is pulling audio data from the EZOutputDataSource for playback.
- @return YES if the EZOutput is running, NO if it is stopped
- */
-@property (readonly) BOOL isPlaying;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the current pan from the audio player's mixer audio unit in the playback graph. Setting the pan adjusts the direction of the audio signal from left (0) to right (1). Default is 0.5 (middle).
- */
-@property (nonatomic, assign) float pan;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the current volume from the audio player's mixer audio unit in the playback graph. Setting the volume adjusts the gain of the output between 0 and 1. Default is 1.
- */
-@property (nonatomic, assign) float volume;
-
-//------------------------------------------------------------------------------
-#pragma mark - Core Audio Properties
-//------------------------------------------------------------------------------
-
-///-----------------------------------------------------------
-/// @name Core Audio Properties
-///-----------------------------------------------------------
-
-/**
- The AUGraph used to chain together the converter, mixer, and output audio units.
- */
-@property (readonly) AUGraph graph;
-
-//------------------------------------------------------------------------------
-
-/**
- The AudioUnit that is being used to convert the audio data coming into the output's playback graph.
- */
-@property (readonly) AudioUnit converterAudioUnit;
-
-//------------------------------------------------------------------------------
-
-/**
- The AudioUnit that is being used as the mixer to adjust the volume on the output's playback graph.
- */
-@property (readonly) AudioUnit mixerAudioUnit;
-
-//------------------------------------------------------------------------------
-
-/**
- The AudioUnit that is being used as the hardware output for the output's playback graph.
- */
-@property (readonly) AudioUnit outputAudioUnit;
-
-//------------------------------------------------------------------------------
-#pragma mark - Setters
-//------------------------------------------------------------------------------
-
-///-----------------------------------------------------------
-/// @name Getting/Setting The Output's Hardware Device
-///-----------------------------------------------------------
-
-/**
- An EZAudioDevice instance that is used to route the audio data out to the speaker. To find a list of available output devices see the EZAudioDevice `outputDevices` method.
- */
-@property (nonatomic, strong, readwrite) EZAudioDevice *device;
-
-//------------------------------------------------------------------------------
-#pragma mark - Actions
-//------------------------------------------------------------------------------
++(EZOutput*)sharedOutput;
 
+#pragma mark - Events
 ///-----------------------------------------------------------
 /// @name Starting/Stopping The Output
 ///-----------------------------------------------------------
@@ -314,63 +158,44 @@ FOUNDATION_EXPORT Float64 const EZOutputDefaultSampleRate;
 /**
  Starts pulling audio data from the EZOutputDataSource to the default device output.
  */
-- (void)startPlayback;
-
-///-----------------------------------------------------------
+-(void)startPlayback;
 
 /**
  Stops pulling audio data from the EZOutputDataSource to the default device output.
  */
-- (void)stopPlayback;
-
-//------------------------------------------------------------------------------
-#pragma mark - Subclass
-//------------------------------------------------------------------------------
+-(void)stopPlayback;
 
+#pragma mark - Getters
 ///-----------------------------------------------------------
-/// @name Subclass
+/// @name Getting The Output Audio Format
 ///-----------------------------------------------------------
 
 /**
- This method handles connecting the converter node to the mixer node within the AUGraph that is being used as the playback graph. Subclasses can override this method and insert their custom nodes to perform effects processing on the audio data being rendered. 
- 
- This was inspired by Daniel Kennett's blog post on how to add a custom equalizer to a CocoaLibSpotify SPCoreAudioController's AUGraph. For more information see Daniel's post and example code here: http://ikennd.ac/blog/2012/04/augraph-basics-in-cocoalibspotify/.
- @param sourceNode              An AUNode representing the node the audio data is coming from.
- @param sourceNodeOutputBus     A UInt32 representing the output bus from the source node that should be connected into the next node's input bus.
- @param destinationNode         An AUNode representing the node the audio data should be connected to.
- @param destinationNodeInputBus A UInt32 representing the input bus the source node's output bus should be connecting to.
- @param graph                   The AUGraph that is being used to hold the playback graph. Same as from the `graph` property.
- @return An OSStatus code. For no error return back `noErr`.
+ Provides the AudioStreamBasicDescription structure containing the format of the microphone's audio.
+ @return An AudioStreamBasicDescription structure describing the format of the microphone's audio.
  */
-- (OSStatus)connectOutputOfSourceNode:(AUNode)sourceNode
-                  sourceNodeOutputBus:(UInt32)sourceNodeOutputBus
-                    toDestinationNode:(AUNode)destinationNode
-              destinationNodeInputBus:(UInt32)destinationNodeInputBus
-                              inGraph:(AUGraph)graph;
+-(AudioStreamBasicDescription)audioStreamBasicDescription;
 
-//------------------------------------------------------------------------------
+///-----------------------------------------------------------
+/// @name Getting The State Of The Output
+///-----------------------------------------------------------
 
 /**
- The default AudioStreamBasicDescription set as the client format of the output if no custom `clientFormat` is set. Defaults to a 44.1 kHz stereo, non-interleaved, float format.
- @return An AudioStreamBasicDescription that will be used as the default stream format.
+ Provides a flag indicating whether the EZOutput is pulling audio data from the EZOutputDataSource for playback.
+ @return YES if the EZOutput is pulling audio data to the output device, NO if it is stopped
  */
-- (AudioStreamBasicDescription)defaultClientFormat;
+-(BOOL)isPlaying;
 
-//------------------------------------------------------------------------------
+#pragma mark - Setters
+///-----------------------------------------------------------
+/// @name Customizing The Output Format
+///-----------------------------------------------------------
 
 /**
- The default AudioStreamBasicDescription set as the `inputFormat` of the output if no custom `inputFormat` is set. Defaults to a 44.1 kHz stereo, non-interleaved, float format.
- @return An AudioStreamBasicDescription that will be used as the default stream format.
+ Sets the AudioStreamBasicDescription on the output.
+ @warning Do not set this during playback.
+ @param asbd The new AudioStreamBasicDescription to use in place of the current audio format description.
  */
-- (AudioStreamBasicDescription)defaultInputFormat;
+-(void)setAudioStreamBasicDescription:(AudioStreamBasicDescription)asbd;
 
-//------------------------------------------------------------------------------
-
-/**
- The default value used as the AudioUnit subtype when creating the hardware output component. By default this is kAudioUnitSubType_RemoteIO for iOS and kAudioUnitSubType_HALOutput for OSX. 
- @warning If you change this to anything other than kAudioUnitSubType_HALOutput for OSX you will get a failed assertion because devices can only be set when using the HAL audio unit.
- @return An OSType that represents the AudioUnit subtype for the hardware output component.
- */
-- (OSType)outputAudioUnitSubType;
-
-@end
+@end

EZAudio/EZPlot.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 11/24/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -24,12 +24,8 @@
 //  THE SOFTWARE.
 
 #import <Foundation/Foundation.h>
-#import "EZAudioUtilities.h"
 
-//------------------------------------------------------------------------------
 #pragma mark - Enumerations
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Plot Types
 ///-----------------------------------------------------------
@@ -37,17 +33,15 @@
 /**
  The types of plots that can be displayed in the view using the data.
  */
-typedef NS_ENUM(NSInteger, EZPlotType)
-{
-    /**
-     Plot that displays only the samples of the current buffer
-     */
-    EZPlotTypeBuffer,
-    
-    /**
-     Plot that displays a rolling history of values using the RMS calculated for each incoming buffer
-     */
-    EZPlotTypeRolling
+typedef NS_ENUM(NSInteger,EZPlotType){
+  /**
+   Plot that displays only the samples of the current buffer
+   */
+  EZPlotTypeBuffer,
+  /**
+   Plot that displays a rolling history of values using the RMS calculated for each incoming buffer
+   */
+  EZPlotTypeRolling
 };
 
 /**
@@ -65,55 +59,41 @@ typedef NS_ENUM(NSInteger, EZPlotType)
 @interface EZPlot : NSView
 #endif
 
-//------------------------------------------------------------------------------
 #pragma mark - Properties
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Customizing The Plot's Appearance
 ///-----------------------------------------------------------
 /**
  The default background color of the plot. For iOS the color is specified as a UIColor while for OSX the color is an NSColor. The default value on both platforms is black.
  */
-#if TARGET_OS_IPHONE
-@property (nonatomic, strong) IBInspectable UIColor *backgroundColor;
-#elif TARGET_OS_MAC
-@property (nonatomic, strong) IBInspectable NSColor *backgroundColor;
-#endif
+@property (nonatomic,strong) id backgroundColor;
 
 /**
  The default color of the plot's data (i.e. waveform, y-axis values). For iOS the color is specified as a UIColor while for OSX the color is an NSColor. The default value on both platforms is red.
  */
-#if TARGET_OS_IPHONE
-@property (nonatomic, strong) IBInspectable UIColor *color;
-#elif TARGET_OS_MAC
-@property (nonatomic, strong) IBInspectable NSColor *color;
-#endif
+@property (nonatomic,strong) id color;
 
 /**
  The plot's gain value, which controls the scale of the y-axis values. The default value of the gain is 1.0f and should always be greater than 0.0f.
  */
-@property (nonatomic, assign) IBInspectable float gain;
+@property (nonatomic,assign,setter=setGain:) float gain;
 
 /**
  The type of plot as specified by the `EZPlotType` enumeration (i.e. a buffer or rolling plot type).
  */
-@property (nonatomic, assign) IBInspectable EZPlotType plotType;
+@property (nonatomic,assign,setter=setPlotType:) EZPlotType plotType;
 
 /**
  A boolean indicating whether or not to fill in the graph. A value of YES will make a filled graph (filling in the space between the x-axis and the y-value), while a value of NO will create a stroked graph (connecting the points along the y-axis).
  */
-@property (nonatomic, assign) IBInspectable BOOL shouldFill;
+@property (nonatomic,assign,setter=setShouldFill:) BOOL shouldFill;
 
 /**
  A boolean indicating whether the graph should be rotated along the x-axis to give a mirrored reflection. This is typical for audio plots to produce the classic waveform look. A value of YES will produce a mirrored reflection of the y-values about the x-axis, while a value of NO will only plot the y-values.
  */
-@property (nonatomic, assign) IBInspectable BOOL shouldMirror;
+@property (nonatomic,assign,setter=setShouldMirror:) BOOL shouldMirror;
 
-//------------------------------------------------------------------------------
 #pragma mark - Clearing
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Clearing The Plot
 ///-----------------------------------------------------------
@@ -123,10 +103,7 @@ typedef NS_ENUM(NSInteger, EZPlotType)
  */
 -(void)clear;
 
-//------------------------------------------------------------------------------
 #pragma mark - Get Samples
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Updating The Plot
 ///-----------------------------------------------------------
@@ -137,6 +114,7 @@ typedef NS_ENUM(NSInteger, EZPlotType)
  @param bufferSize The size of the float array that will be mapped to the y-axis.
  @warning The bufferSize is expected to be the same, constant value once initial triggered. For plots using OpenGL a vertex buffer object will be allocated with a maximum buffersize of (2 * the initial given buffer size) to account for any interpolation necessary for filling in the graph. Updates use the glBufferSubData(...) function, which will crash if the buffersize exceeds the initial maximum allocated size.
  */
--(void)updateBuffer:(float *)buffer withBufferSize:(UInt32)bufferSize;
+-(void)updateBuffer:(float *)buffer
+     withBufferSize:(UInt32)bufferSize;
 
 @end

EZAudio/EZPlot.m

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 11/24/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

EZAudio/EZRecorder.h

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 12/1/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -26,12 +26,6 @@
 #import <Foundation/Foundation.h>
 #import <AudioToolbox/AudioToolbox.h>
 
-@class EZRecorder;
-
-//------------------------------------------------------------------------------
-#pragma mark - Data Structures
-//------------------------------------------------------------------------------
-
 /**
  To ensure valid recording formats are used when recording to a file the EZRecorderFileType describes the most common file types that a file can be encoded in. Each of these types can be used to output recordings as such:
  
@@ -56,290 +50,57 @@ typedef NS_ENUM(NSInteger, EZRecorderFileType)
     EZRecorderFileTypeWAV
 };
 
-//------------------------------------------------------------------------------
-#pragma mark - EZRecorderDelegate
-//------------------------------------------------------------------------------
-
-/**
- The EZRecorderDelegate for the EZRecorder provides a receiver for write events, `recorderUpdatedCurrentTime:`, and the close event, `recorderDidClose:`.
- */
-@protocol EZRecorderDelegate <NSObject>
-
-@optional
-
-/**
- Triggers when the EZRecorder is explicitly closed with the `closeAudioFile` method.
- @param recorder The EZRecorder instance that triggered the action
- */
-- (void)recorderDidClose:(EZRecorder *)recorder;
-
-/**
- Triggers after the EZRecorder has successfully written audio data from the `appendDataFromBufferList:withBufferSize:` method.
- @param recorder The EZRecorder instance that triggered the action
- */
-- (void)recorderUpdatedCurrentTime:(EZRecorder *)recorder;
-
-@end
-
-//------------------------------------------------------------------------------
-#pragma mark - EZRecorder
-//------------------------------------------------------------------------------
-
 /**
  The EZRecorder provides a flexible way to create an audio file and append raw audio data to it. The EZRecorder will convert the incoming audio on the fly to the destination format so no conversion is needed between this and any other component. Right now the only supported output format is 'caf'. Each output file should have its own EZRecorder instance (think 1 EZRecorder = 1 audio file).
  */
 @interface EZRecorder : NSObject
 
-//------------------------------------------------------------------------------
-#pragma mark - Properties
-//------------------------------------------------------------------------------
-
-/**
- An EZRecorderDelegate to listen for the write and close events.
- */
-@property (nonatomic, weak) id<EZRecorderDelegate> delegate;
-
-//------------------------------------------------------------------------------
 #pragma mark - Initializers
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Initializers
 ///-----------------------------------------------------------
 
-/**
- Creates an instance of the EZRecorder with a file path URL to write out the file to, a client format describing the in-application common format (see `clientFormat` for more info), and a file type (see `EZRecorderFileType`) that will automatically create an internal `fileFormat` and audio file type hint.
- @param url             An NSURL representing the file path the output file should be written
- @param clientFormat    An AudioStreamBasicDescription describing the in-applciation common format (always linear PCM)
- @param fileType A constant described by the EZRecorderFileType that corresponds to the type of destination file that should be written. For instance, an AAC file written using an '.m4a' extension would correspond to EZRecorderFileTypeM4A. See EZRecorderFileType for all the constants and mapping combinations.
- @return A newly created EZRecorder instance.
- */
-- (instancetype)initWithURL:(NSURL *)url
-               clientFormat:(AudioStreamBasicDescription)clientFormat
-                   fileType:(EZRecorderFileType)fileType;
-
-//------------------------------------------------------------------------------
-
-/**
- Creates an instance of the EZRecorder with a file path URL to write out the file to, a client format describing the in-application common format (see `clientFormat` for more info), and a file type (see `EZRecorderFileType`) that will automatically create an internal `fileFormat` and audio file type hint, as well as a delegate to respond to the recorder's write and close events.
- @param url             An NSURL representing the file path the output file should be written
- @param clientFormat    An AudioStreamBasicDescription describing the in-applciation common format (always linear PCM)
- @param fileType A constant described by the EZRecorderFileType that corresponds to the type of destination file that should be written. For instance, an AAC file written using an '.m4a' extension would correspond to EZRecorderFileTypeM4A. See EZRecorderFileType for all the constants and mapping combinations.
- @param delegate        An EZRecorderDelegate to listen for the recorder's write and close events.
- @return A newly created EZRecorder instance.
- */
-- (instancetype)initWithURL:(NSURL *)url
-               clientFormat:(AudioStreamBasicDescription)clientFormat
-                   fileType:(EZRecorderFileType)fileType
-                   delegate:(id<EZRecorderDelegate>)delegate;
-
-//------------------------------------------------------------------------------
-
-/**
- Creates an instance of the EZRecorder with a file path URL to write out the file to, a client format describing the in-application common format (see `clientFormat` for more info), a file format describing the destination format on disk (see `fileFormat` for more info), and an audio file type (an AudioFileTypeID for Core Audio, not a EZRecorderFileType).
- @param url             An NSURL representing the file path the output file should be written
- @param clientFormat    An AudioStreamBasicDescription describing the in-applciation common format (always linear PCM)
- @param fileFormat      An AudioStreamBasicDescription describing the format of the audio being written to disk (MP3, AAC, WAV, etc)
- @param audioFileTypeID An AudioFileTypeID that matches your fileFormat (i.e. kAudioFileM4AType for an M4A format)
- @return A newly created EZRecorder instance.
- */
-- (instancetype)initWithURL:(NSURL *)url
-               clientFormat:(AudioStreamBasicDescription)clientFormat
-                 fileFormat:(AudioStreamBasicDescription)fileFormat
-            audioFileTypeID:(AudioFileTypeID)audioFileTypeID;
-
-//------------------------------------------------------------------------------
-
-/**
- Creates an instance of the EZRecorder with a file path URL to write out the file to, a client format describing the in-application common format (see `clientFormat` for more info), a file format describing the destination format on disk (see `fileFormat` for more info), an audio file type (an AudioFileTypeID for Core Audio, not a EZRecorderFileType), and delegate to respond to the recorder's write and close events.
- @param url             An NSURL representing the file path the output file should be written
- @param clientFormat    An AudioStreamBasicDescription describing the in-applciation common format (always linear PCM)
- @param fileFormat      An AudioStreamBasicDescription describing the format of the audio being written to disk (MP3, AAC, WAV, etc)
- @param audioFileTypeID An AudioFileTypeID that matches your fileFormat (i.e. kAudioFileM4AType for an M4A format)
- @param delegate        An EZRecorderDelegate to listen for the recorder's write and close events.
- @return A newly created EZRecorder instance.
- */
-- (instancetype)initWithURL:(NSURL *)url
-               clientFormat:(AudioStreamBasicDescription)clientFormat
-                 fileFormat:(AudioStreamBasicDescription)fileFormat
-            audioFileTypeID:(AudioFileTypeID)audioFileTypeID
-                   delegate:(id<EZRecorderDelegate>)delegate;
-
-//------------------------------------------------------------------------------
-
 /**
  Creates a new instance of an EZRecorder using a destination file path URL and the source format of the incoming audio.
  @param url                 An NSURL specifying the file path location of where the audio file should be written to.
  @param sourceFormat        The AudioStreamBasicDescription for the incoming audio that will be written to the file.
  @param destinationFileType A constant described by the EZRecorderFileType that corresponds to the type of destination file that should be written. For instance, an AAC file written using an '.m4a' extension would correspond to EZRecorderFileTypeM4A. See EZRecorderFileType for all the constants and mapping combinations.
- @deprecated This property is deprecated starting in version 0.8.0.
- @note Please use `initWithURL:clientFormat:fileType:` initializer instead.
  @return The newly created EZRecorder instance.
  */
-- (instancetype)initWithDestinationURL:(NSURL*)url
+-(EZRecorder*)initWithDestinationURL:(NSURL*)url
                         sourceFormat:(AudioStreamBasicDescription)sourceFormat
-                 destinationFileType:(EZRecorderFileType)destinationFileType __attribute__((deprecated));
+                 destinationFileType:(EZRecorderFileType)destinationFileType;
+
 
-//------------------------------------------------------------------------------
 #pragma mark - Class Initializers
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
 /// @name Class Initializers
 ///-----------------------------------------------------------
 
-/**
- Class method to create an instance of the EZRecorder with a file path URL to write out the file to, a client format describing the in-application common format (see `clientFormat` for more info), and a file type (see `EZRecorderFileType`) that will automatically create an internal `fileFormat` and audio file type hint.
- @param url             An NSURL representing the file path the output file should be written
- @param clientFormat    An AudioStreamBasicDescription describing the in-applciation common format (always linear PCM)
- @param fileType A constant described by the EZRecorderFileType that corresponds to the type of destination file that should be written. For instance, an AAC file written using an '.m4a' extension would correspond to EZRecorderFileTypeM4A. See EZRecorderFileType for all the constants and mapping combinations.
- @return A newly created EZRecorder instance.
- */
-+ (instancetype)recorderWithURL:(NSURL *)url
-                   clientFormat:(AudioStreamBasicDescription)clientFormat
-                       fileType:(EZRecorderFileType)fileType;
-
-//------------------------------------------------------------------------------
-
-/**
- Class method to create an instance of the EZRecorder with a file path URL to write out the file to, a client format describing the in-application common format (see `clientFormat` for more info), and a file type (see `EZRecorderFileType`) that will automatically create an internal `fileFormat` and audio file type hint, as well as a delegate to respond to the recorder's write and close events.
- @param url             An NSURL representing the file path the output file should be written
- @param clientFormat    An AudioStreamBasicDescription describing the in-applciation common format (always linear PCM)
- @param fileType A constant described by the EZRecorderFileType that corresponds to the type of destination file that should be written. For instance, an AAC file written using an '.m4a' extension would correspond to EZRecorderFileTypeM4A. See EZRecorderFileType for all the constants and mapping combinations.
- @param delegate        An EZRecorderDelegate to listen for the recorder's write and close events.
- @return A newly created EZRecorder instance.
- */
-+ (instancetype)recorderWithURL:(NSURL *)url
-                   clientFormat:(AudioStreamBasicDescription)clientFormat
-                       fileType:(EZRecorderFileType)fileType
-                       delegate:(id<EZRecorderDelegate>)delegate;
-
-//------------------------------------------------------------------------------
-
-/**
- Class method to create an instance of the EZRecorder with a file path URL to write out the file to, a client format describing the in-application common format (see `clientFormat` for more info), a file format describing the destination format on disk (see `fileFormat` for more info), and an audio file type (an AudioFileTypeID for Core Audio, not a EZRecorderFileType).
- @param url             An NSURL representing the file path the output file should be written
- @param clientFormat    An AudioStreamBasicDescription describing the in-applciation common format (always linear PCM)
- @param fileFormat      An AudioStreamBasicDescription describing the format of the audio being written to disk (MP3, AAC, WAV, etc)
- @param audioFileTypeID An AudioFileTypeID that matches your fileFormat (i.e. kAudioFileM4AType for an M4A format)
- @return A newly created EZRecorder instance.
- */
-+ (instancetype)recorderWithURL:(NSURL *)url
-                   clientFormat:(AudioStreamBasicDescription)clientFormat
-                     fileFormat:(AudioStreamBasicDescription)fileFormat
-                audioFileTypeID:(AudioFileTypeID)audioFileTypeID;
-
-//------------------------------------------------------------------------------
-
-/**
- Class method to create an instance of the EZRecorder with a file path URL to write out the file to, a client format describing the in-application common format (see `clientFormat` for more info), a file format describing the destination format on disk (see `fileFormat` for more info), an audio file type (an AudioFileTypeID for Core Audio, not a EZRecorderFileType), and delegate to respond to the recorder's write and close events.
- @param url             An NSURL representing the file path the output file should be written
- @param clientFormat    An AudioStreamBasicDescription describing the in-applciation common format (always linear PCM)
- @param fileFormat      An AudioStreamBasicDescription describing the format of the audio being written to disk (MP3, AAC, WAV, etc)
- @param audioFileTypeID An AudioFileTypeID that matches your fileFormat (i.e. kAudioFileM4AType for an M4A format)
- @param delegate        An EZRecorderDelegate to listen for the recorder's write and close events.
- @return A newly created EZRecorder instance.
- */
-+ (instancetype)recorderWithURL:(NSURL *)url
-                   clientFormat:(AudioStreamBasicDescription)clientFormat
-                     fileFormat:(AudioStreamBasicDescription)fileFormat
-                audioFileTypeID:(AudioFileTypeID)audioFileTypeID
-                       delegate:(id<EZRecorderDelegate>)delegate;
-
-//------------------------------------------------------------------------------
-
 /**
  Class method to create a new instance of an EZRecorder using a destination file path URL and the source format of the incoming audio.
  @param url                 An NSURL specifying the file path location of where the audio file should be written to.
- @param sourceFormat        The AudioStreamBasicDescription for the incoming audio that will be written to the file (also called the `clientFormat`).
+ @param sourceFormat        The AudioStreamBasicDescription for the incoming audio that will be written to the file.
  @param destinationFileType A constant described by the EZRecorderFileType that corresponds to the type of destination file that should be written. For instance, an AAC file written using an '.m4a' extension would correspond to EZRecorderFileTypeM4A. See EZRecorderFileType for all the constants and mapping combinations.
  @return The newly created EZRecorder instance.
  */
-+ (instancetype)recorderWithDestinationURL:(NSURL*)url
-                             sourceFormat:(AudioStreamBasicDescription)sourceFormat
-                      destinationFileType:(EZRecorderFileType)destinationFileType __attribute__((deprecated));
-
-//------------------------------------------------------------------------------
-#pragma mark - Properties
-//------------------------------------------------------------------------------
++(EZRecorder*)recorderWithDestinationURL:(NSURL*)url
+                            sourceFormat:(AudioStreamBasicDescription)sourceFormat
+                     destinationFileType:(EZRecorderFileType)destinationFileType;
 
+#pragma mark - Getters
 ///-----------------------------------------------------------
 /// @name Getting The Recorder's Properties
 ///-----------------------------------------------------------
-
-/**
- Provides the common AudioStreamBasicDescription that will be used for in-app interaction. The recorder's format will be converted from this format to the `fileFormat`. For instance, the file on disk could be a 22.5 kHz, float format, but we might have an audio processing graph that has a 44.1 kHz, signed integer format that we'd like to interact with. The client format lets us set that 44.1 kHz format on the recorder to properly write samples from the graph out to the file in the desired destination format.
- @warning This must be a linear PCM format!
- @return An AudioStreamBasicDescription structure describing the format of the audio file.
- */
-@property (readwrite) AudioStreamBasicDescription clientFormat;
-//------------------------------------------------------------------------------
-
-/**
- Provides the current write offset in the audio file as an NSTimeInterval (i.e. in seconds).  When setting this it will determine the correct frame offset and perform a `seekToFrame` to the new time offset.
- @warning Make sure the new current time offset is less than the `duration` or you will receive an invalid seek assertion.
- */
-@property (readonly) NSTimeInterval currentTime;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the duration of the audio file in seconds.
- */
-@property (readonly) NSTimeInterval duration;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the AudioStreamBasicDescription structure containing the format of the recorder's audio file.
- @return An AudioStreamBasicDescription structure describing the format of the audio file.
- */
-@property (readonly) AudioStreamBasicDescription fileFormat;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the current time as an NSString with the time format MM:SS.
- */
-@property (readonly) NSString *formattedCurrentTime;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the duration as an NSString with the time format MM:SS.
- */
-@property (readonly) NSString *formattedDuration;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the frame index (a.k.a the write positon) within the audio file as SInt64. This can be helpful when seeking through the audio file.
- @return The current frame index within the audio file as a SInt64.
- */
-@property (readonly) SInt64 frameIndex;
-
-//------------------------------------------------------------------------------
-
-/**
- Provides the total frame count of the recorder's audio file in the file format.
- @return The total number of frames in the recorder in the AudioStreamBasicDescription representing the file format as a SInt64.
- */
-@property (readonly) SInt64 totalFrames;
-
-//------------------------------------------------------------------------------
-
 /**
  Provides the file path that's currently being used by the recorder.
- @return  The NSURL representing the file path of the recorder path being used for recording.
+ @return  The NSURL representing the file path of the audio file path being used for recording.
  */
-- (NSURL *)url;
+-(NSURL*)url;
 
-//------------------------------------------------------------------------------
 #pragma mark - Events
-//------------------------------------------------------------------------------
-
 ///-----------------------------------------------------------
-/// @name Appending Data To The Recorder
+/// @name Appending Data To The Audio File
 ///-----------------------------------------------------------
 
 /**
@@ -347,18 +108,16 @@ typedef NS_ENUM(NSInteger, EZRecorderFileType)
  @param bufferList The AudioBufferList holding the audio data to append
  @param bufferSize The size of each of the buffers in the buffer list.
  */
-- (void)appendDataFromBufferList:(AudioBufferList *)bufferList
-                  withBufferSize:(UInt32)bufferSize;
-
-//------------------------------------------------------------------------------
+-(void)appendDataFromBufferList:(AudioBufferList*)bufferList
+                 withBufferSize:(UInt32)bufferSize;
 
 ///-----------------------------------------------------------
-/// @name Closing The Recorder
+/// @name Closing The Audio File
 ///-----------------------------------------------------------
 
 /**
- Finishes writes to the recorder's audio file and closes it.
+ Finishes writes to the audio file and closes it.
  */
-- (void)closeAudioFile;
+-(void)closeAudioFile;
 
 @end

EZAudio/EZRecorder.m

@@ -3,7 +3,7 @@
 //  EZAudio
 //
 //  Created by Syed Haris Ali on 12/1/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -26,210 +26,65 @@
 #import "EZRecorder.h"
 #import "EZAudioUtilities.h"
 
-//------------------------------------------------------------------------------
-#pragma mark - Data Structures
-//------------------------------------------------------------------------------
+@interface EZRecorder (){
+    ExtAudioFileRef             _destinationFile;
+    AudioFileTypeID             _destinationFileTypeID;
+    CFURLRef                    _destinationFileURL;
+    AudioStreamBasicDescription _destinationFormat;
+    AudioStreamBasicDescription _sourceFormat;
+}
 
-typedef struct
-{
-    AudioFileTypeID             audioFileTypeID;
-    ExtAudioFileRef             extAudioFileRef;
-    AudioStreamBasicDescription clientFormat;
-    BOOL                        closed;
-    CFURLRef                    fileURL;
-    AudioStreamBasicDescription fileFormat;
-} EZRecorderInfo;
-
-//------------------------------------------------------------------------------
-#pragma mark - EZRecorder (Interface Extension)
-//------------------------------------------------------------------------------
-
-@interface EZRecorder ()
-@property (nonatomic, assign) EZRecorderInfo *info;
 @end
 
-//------------------------------------------------------------------------------
-#pragma mark - EZRecorder (Implementation)
-//------------------------------------------------------------------------------
-
 @implementation EZRecorder
 
-//------------------------------------------------------------------------------
-#pragma mark - Dealloc
-//------------------------------------------------------------------------------
-
-- (void)dealloc
-{
-    if (!self.info->closed)
-    {
-        [self closeAudioFile];
-    }
-    free(self.info);
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - Initializers
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithURL:(NSURL *)url
-               clientFormat:(AudioStreamBasicDescription)clientFormat
-                   fileType:(EZRecorderFileType)fileType
+-(EZRecorder*)initWithDestinationURL:(NSURL*)url
+                        sourceFormat:(AudioStreamBasicDescription)sourceFormat
+                 destinationFileType:(EZRecorderFileType)destinationFileType
 {
-    return [self initWithURL:url
-                clientFormat:clientFormat
-                    fileType:fileType
-                    delegate:nil];
-}
-
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithURL:(NSURL *)url
-               clientFormat:(AudioStreamBasicDescription)clientFormat
-                   fileType:(EZRecorderFileType)fileType
-                   delegate:(id<EZRecorderDelegate>)delegate
-{
-    AudioStreamBasicDescription fileFormat = [EZRecorder formatForFileType:fileType
-                                                          withSourceFormat:clientFormat];
-    AudioFileTypeID audioFileTypeID = [EZRecorder fileTypeIdForFileType:fileType
-                                                       withSourceFormat:clientFormat];
-    return [self initWithURL:url
-                clientFormat:clientFormat
-                  fileFormat:fileFormat
-             audioFileTypeID:audioFileTypeID
-                    delegate:delegate];
-}
-
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithURL:(NSURL *)url
-               clientFormat:(AudioStreamBasicDescription)clientFormat
-                 fileFormat:(AudioStreamBasicDescription)fileFormat
-            audioFileTypeID:(AudioFileTypeID)audioFileTypeID
-{
-    return [self initWithURL:url
-                clientFormat:clientFormat
-                  fileFormat:fileFormat
-             audioFileTypeID:audioFileTypeID
-                    delegate:nil];
-}
-
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithURL:(NSURL *)url
-               clientFormat:(AudioStreamBasicDescription)clientFormat
-                 fileFormat:(AudioStreamBasicDescription)fileFormat
-            audioFileTypeID:(AudioFileTypeID)audioFileTypeID
-                   delegate:(id<EZRecorderDelegate>)delegate
-{
-    
     self = [super init];
     if (self)
     {
         // Set defaults
-        self.info = (EZRecorderInfo *)calloc(1, sizeof(EZRecorderInfo));
-        self.info->audioFileTypeID  = audioFileTypeID;
-        self.info->fileURL = (__bridge CFURLRef)url;
-        self.info->clientFormat = clientFormat;
-        self.info->fileFormat = fileFormat;
-        self.delegate = delegate;
-        [self setup];
+        _destinationFile        = NULL;
+        _destinationFileURL     = (__bridge CFURLRef)url;
+        _sourceFormat           = sourceFormat;
+        _destinationFormat      = [EZRecorder recorderFormatForFileType:destinationFileType
+                                                       withSourceFormat:_sourceFormat];
+        _destinationFileTypeID  = [EZRecorder recorderFileTypeIdForFileType:destinationFileType
+                                                           withSourceFormat:_sourceFormat];
+        
+        // Initializer the recorder instance
+        [self _initializeRecorder];
     }
     return self;
 }
 
-//------------------------------------------------------------------------------
-
-- (instancetype)initWithDestinationURL:(NSURL*)url
-                        sourceFormat:(AudioStreamBasicDescription)sourceFormat
-                 destinationFileType:(EZRecorderFileType)destinationFileType
-{
-    return [self initWithURL:url
-                clientFormat:sourceFormat
-                    fileType:destinationFileType];
-}
-
-//------------------------------------------------------------------------------
 #pragma mark - Class Initializers
-//------------------------------------------------------------------------------
-
-+ (instancetype)recorderWithURL:(NSURL *)url
-                   clientFormat:(AudioStreamBasicDescription)clientFormat
-                       fileType:(EZRecorderFileType)fileType
-{
-    return [[self alloc] initWithURL:url
-                        clientFormat:clientFormat
-                            fileType:fileType];
-}
-
-//------------------------------------------------------------------------------
-
-+ (instancetype)recorderWithURL:(NSURL *)url
-                   clientFormat:(AudioStreamBasicDescription)clientFormat
-                       fileType:(EZRecorderFileType)fileType
-                       delegate:(id<EZRecorderDelegate>)delegate
-{
-    return [[self alloc] initWithURL:url
-                        clientFormat:clientFormat
-                            fileType:fileType
-                            delegate:delegate];
-}
-
-//------------------------------------------------------------------------------
-
-+ (instancetype)recorderWithURL:(NSURL *)url
-                   clientFormat:(AudioStreamBasicDescription)clientFormat
-                     fileFormat:(AudioStreamBasicDescription)fileFormat
-                audioFileTypeID:(AudioFileTypeID)audioFileTypeID
-{
-    return [[self alloc] initWithURL:url
-                        clientFormat:clientFormat
-                          fileFormat:fileFormat
-                     audioFileTypeID:audioFileTypeID];
-}
-
-//------------------------------------------------------------------------------
-
-+ (instancetype)recorderWithURL:(NSURL *)url
-                   clientFormat:(AudioStreamBasicDescription)clientFormat
-                     fileFormat:(AudioStreamBasicDescription)fileFormat
-                audioFileTypeID:(AudioFileTypeID)audioFileTypeID
-                       delegate:(id<EZRecorderDelegate>)delegate
-{
-    return [[self alloc] initWithURL:url
-                        clientFormat:clientFormat
-                          fileFormat:fileFormat
-                     audioFileTypeID:audioFileTypeID
-                            delegate:delegate];
-}
-
-//------------------------------------------------------------------------------
-
-+ (instancetype)recorderWithDestinationURL:(NSURL*)url
-                             sourceFormat:(AudioStreamBasicDescription)sourceFormat
-                      destinationFileType:(EZRecorderFileType)destinationFileType
++(EZRecorder*)recorderWithDestinationURL:(NSURL*)url
+                            sourceFormat:(AudioStreamBasicDescription)sourceFormat
+                     destinationFileType:(EZRecorderFileType)destinationFileType
 {
     return [[EZRecorder alloc] initWithDestinationURL:url
                                          sourceFormat:sourceFormat
                                   destinationFileType:destinationFileType];
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Class Methods
-//------------------------------------------------------------------------------
-
-+ (AudioStreamBasicDescription)formatForFileType:(EZRecorderFileType)fileType
-                                withSourceFormat:(AudioStreamBasicDescription)sourceFormat
+#pragma mark - Private Configuration
++(AudioStreamBasicDescription)recorderFormatForFileType:(EZRecorderFileType)fileType
+                                       withSourceFormat:(AudioStreamBasicDescription)sourceFormat
 {
     AudioStreamBasicDescription asbd;
-    switch (fileType)
+    switch ( fileType)
     {
         case EZRecorderFileTypeAIFF:
             asbd = [EZAudioUtilities AIFFFormatWithNumberOfChannels:sourceFormat.mChannelsPerFrame
-                                                         sampleRate:sourceFormat.mSampleRate];
+                                                sampleRate:sourceFormat.mSampleRate];
             break;
         case EZRecorderFileTypeM4A:
             asbd = [EZAudioUtilities M4AFormatWithNumberOfChannels:sourceFormat.mChannelsPerFrame
-                                                        sampleRate:sourceFormat.mSampleRate];
+                                               sampleRate:sourceFormat.mSampleRate];
             break;
             
         case EZRecorderFileTypeWAV:
@@ -243,13 +98,11 @@ typedef struct
     return asbd;
 }
 
-//------------------------------------------------------------------------------
-
-+ (AudioFileTypeID)fileTypeIdForFileType:(EZRecorderFileType)fileType
-                        withSourceFormat:(AudioStreamBasicDescription)sourceFormat
++(AudioFileTypeID)recorderFileTypeIdForFileType:(EZRecorderFileType)fileType
+                               withSourceFormat:(AudioStreamBasicDescription)sourceFormat
 {
     AudioFileTypeID audioFileTypeID;
-    switch (fileType)
+    switch ( fileType)
     {
         case EZRecorderFileTypeAIFF:
             audioFileTypeID = kAudioFileAIFFType;
@@ -270,187 +123,70 @@ typedef struct
     return audioFileTypeID;
 }
 
-//------------------------------------------------------------------------------
-
-- (void)setup
+-(void)_initializeRecorder
 {
     // Finish filling out the destination format description
-    UInt32 propSize = sizeof(self.info->fileFormat);
+    UInt32 propSize = sizeof(_destinationFormat);
     [EZAudioUtilities checkResult:AudioFormatGetProperty(kAudioFormatProperty_FormatInfo,
-                                                         0,
-                                                         NULL,
-                                                         &propSize,
-                                                         &self.info->fileFormat)
-                        operation:"Failed to fill out rest of destination format"];
+                                                0,
+                                                NULL,
+                                                &propSize,
+                                                &_destinationFormat)
+               operation:"Failed to fill out rest of destination format"];
     
-    //
     // Create the audio file
-    //
-    [EZAudioUtilities checkResult:ExtAudioFileCreateWithURL(self.info->fileURL,
-                                                            self.info->audioFileTypeID,
-                                                            &self.info->fileFormat,
-                                                            NULL,
-                                                            kAudioFileFlags_EraseFile,
-                                                            &self.info->extAudioFileRef)
-                        operation:"Failed to create audio file"];
+    [EZAudioUtilities checkResult:ExtAudioFileCreateWithURL(_destinationFileURL,
+                                                   _destinationFileTypeID,
+                                                   &_destinationFormat,
+                                                   NULL,
+                                                   kAudioFileFlags_EraseFile,
+                                                   &_destinationFile)
+               operation:"Failed to create audio file"];
+    
+    // Set the client format (which should be equal to the source format)
+    [EZAudioUtilities checkResult:ExtAudioFileSetProperty(_destinationFile,
+                                                 kExtAudioFileProperty_ClientDataFormat,
+                                                 sizeof(_sourceFormat),
+                                                 &_sourceFormat)
+               operation:"Failed to set client format on recorded audio file"];
     
-    //
-    // Set the client format
-    //
-    [self setClientFormat:self.info->clientFormat];
 }
 
-//------------------------------------------------------------------------------
 #pragma mark - Events
-//------------------------------------------------------------------------------
-
-- (void)appendDataFromBufferList:(AudioBufferList *)bufferList
-                  withBufferSize:(UInt32)bufferSize
+-(void)appendDataFromBufferList:(AudioBufferList *)bufferList
+                 withBufferSize:(UInt32)bufferSize
 {
-    //
-    // Make sure the audio file is not closed
-    //
-    NSAssert(!self.info->closed, @"Cannot append data when EZRecorder has been closed. You must create a new instance.;");
-    
-    //
-    // Perform the write
-    //
-    [EZAudioUtilities checkResult:ExtAudioFileWrite(self.info->extAudioFileRef,
-                                                         bufferSize,
-                                                         bufferList)
-               operation:"Failed to write audio data to recorded audio file"];
-    
-    //
-    // Notify delegate
-    //
-    if ([self.delegate respondsToSelector:@selector(recorderUpdatedCurrentTime:)])
+    if (_destinationFile)
     {
-        [self.delegate recorderUpdatedCurrentTime:self];
+        [EZAudioUtilities checkResult:ExtAudioFileWriteAsync(_destinationFile,
+                                                    bufferSize,
+                                                    bufferList)
+                   operation:"Failed to write audio data to recorded audio file"];
     }
 }
 
-//------------------------------------------------------------------------------
-
-- (void)closeAudioFile
+-(void)closeAudioFile
 {
-    if (!self.info->closed)
+    if (_destinationFile)
     {
-        //
-        // Close, audio file can no longer be written to
-        //
-        [EZAudioUtilities checkResult:ExtAudioFileDispose(self.info->extAudioFileRef)
-                            operation:"Failed to close audio file"];
-        self.info->closed = YES;
+        // Dispose of the audio file reference
+        [EZAudioUtilities checkResult:ExtAudioFileDispose(_destinationFile)
+                   operation:"Failed to close audio file"];
         
-        //
-        // Notify delegate
-        //
-        if ([self.delegate respondsToSelector:@selector(recorderDidClose:)])
-        {
-            [self.delegate recorderDidClose:self];
-        }
+        // Null out the file reference
+        _destinationFile = NULL;
     }
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Getters
-//------------------------------------------------------------------------------
-
-- (AudioStreamBasicDescription)clientFormat
+-(NSURL *)url
 {
-    return self.info->clientFormat;
+    return (__bridge NSURL*)_destinationFileURL;
 }
 
-//-----------------------------------------------------------------------------
-
-- (NSTimeInterval)currentTime
+#pragma mark - Dealloc
+-(void)dealloc
 {
-    NSTimeInterval currentTime = 0.0;
-    NSTimeInterval duration = [self duration];
-    if (duration != 0.0)
-    {
-        currentTime = (NSTimeInterval)[EZAudioUtilities MAP:(float)[self frameIndex]
-                                                    leftMin:0.0f
-                                                    leftMax:(float)[self totalFrames]
-                                                   rightMin:0.0f
-                                                   rightMax:duration];
-    }
-    return currentTime;
-}
-
-//------------------------------------------------------------------------------
-
-- (NSTimeInterval)duration
-{
-    NSTimeInterval frames = (NSTimeInterval)[self totalFrames];
-    return (NSTimeInterval) frames / self.info->fileFormat.mSampleRate;
-}
-
-//------------------------------------------------------------------------------
-
-- (AudioStreamBasicDescription)fileFormat
-{
-    return self.info->fileFormat;
-}
-
-//------------------------------------------------------------------------------
-
-- (NSString *)formattedCurrentTime
-{
-    return [EZAudioUtilities displayTimeStringFromSeconds:[self currentTime]];
-}
-
-//------------------------------------------------------------------------------
-
-- (NSString *)formattedDuration
-{
-    return [EZAudioUtilities displayTimeStringFromSeconds:[self duration]];
-}
-
-//------------------------------------------------------------------------------
-
-- (SInt64)frameIndex
-{
-    SInt64 frameIndex;
-    [EZAudioUtilities checkResult:ExtAudioFileTell(self.info->extAudioFileRef,
-                                                   &frameIndex)
-                        operation:"Failed to get frame index"];
-    return frameIndex;
-}
-
-//------------------------------------------------------------------------------
-
-- (SInt64)totalFrames
-{
-    SInt64 totalFrames;
-    UInt32 propSize = sizeof(SInt64);
-    [EZAudioUtilities checkResult:ExtAudioFileGetProperty(self.info->extAudioFileRef,
-                                                          kExtAudioFileProperty_FileLengthFrames,
-                                                          &propSize,
-                                                          &totalFrames)
-                        operation:"Recorder failed to get total frames."];
-    return totalFrames;
-}
-
-//------------------------------------------------------------------------------
-
-- (NSURL *)url
-{
-    return (__bridge NSURL*)self.info->fileURL;
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Setters
-//------------------------------------------------------------------------------
-
-- (void)setClientFormat:(AudioStreamBasicDescription)clientFormat
-{
-    [EZAudioUtilities checkResult:ExtAudioFileSetProperty(self.info->extAudioFileRef,
-                                                          kExtAudioFileProperty_ClientDataFormat,
-                                                          sizeof(clientFormat),
-                                                          &clientFormat)
-                        operation:"Failed to set client format on recorded audio file"];
-    self.info->clientFormat = clientFormat;
+    [self closeAudioFile];
 }
 
 @end

EZAudioExamples/OSX/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample.xcodeproj/project.pbxproj

@@ -21,23 +21,24 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		66755A311B3B790D0013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A0E1B3B790D0013E67E /* EZAudio.m */; };
-		66755A321B3B790D0013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A101B3B790D0013E67E /* EZAudioDevice.m */; };
-		66755A331B3B790D0013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A121B3B790D0013E67E /* EZAudioDisplayLink.m */; };
-		66755A341B3B790D0013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A141B3B790D0013E67E /* EZAudioFile.m */; };
-		66755A351B3B790D0013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A161B3B790D0013E67E /* EZAudioFloatConverter.m */; };
-		66755A361B3B790D0013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A181B3B790D0013E67E /* EZAudioFloatData.m */; };
-		66755A371B3B790D0013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A1A1B3B790D0013E67E /* EZAudioPlayer.m */; };
-		66755A381B3B790D0013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A1C1B3B790D0013E67E /* EZAudioPlot.m */; };
-		66755A391B3B790D0013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A1E1B3B790D0013E67E /* EZAudioPlotGL.m */; };
-		66755A3B1B3B790D0013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A221B3B790D0013E67E /* EZAudioUtilities.m */; };
-		66755A3C1B3B790D0013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A241B3B790D0013E67E /* EZMicrophone.m */; };
-		66755A3D1B3B790D0013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A261B3B790D0013E67E /* EZOutput.m */; };
-		66755A3E1B3B790D0013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A281B3B790D0013E67E /* EZPlot.m */; };
-		66755A3F1B3B790D0013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A2A1B3B790D0013E67E /* EZRecorder.m */; };
-		66755A401B3B790D0013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 66755A2B1B3B790D0013E67E /* TPCircularBuffer.c */; };
-		66755A411B3B790D0013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 66755A2E1B3B790D0013E67E /* CHANGELOG */; };
-		66755A421B3B790D0013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 66755A2F1B3B790D0013E67E /* VERSION */; };
+		665956E81B38B256003E97A1 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956C61B38B256003E97A1 /* AEFloatConverter.m */; };
+		665956E91B38B256003E97A1 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956C81B38B256003E97A1 /* EZAudio.m */; };
+		665956EA1B38B256003E97A1 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956CA1B38B256003E97A1 /* EZAudioDevice.m */; };
+		665956EB1B38B256003E97A1 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956CC1B38B256003E97A1 /* EZAudioFile.m */; };
+		665956EC1B38B256003E97A1 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956CE1B38B256003E97A1 /* EZAudioFloatConverter.m */; };
+		665956ED1B38B256003E97A1 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956D01B38B256003E97A1 /* EZAudioFloatData.m */; };
+		665956EE1B38B256003E97A1 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956D21B38B256003E97A1 /* EZAudioPlayer.m */; };
+		665956EF1B38B256003E97A1 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956D41B38B256003E97A1 /* EZAudioPlot.m */; };
+		665956F01B38B256003E97A1 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956D61B38B256003E97A1 /* EZAudioPlotGL.m */; };
+		665956F11B38B256003E97A1 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956D81B38B256003E97A1 /* EZAudioPlotGLKViewController.m */; };
+		665956F21B38B256003E97A1 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956DA1B38B256003E97A1 /* EZAudioUtilities.m */; };
+		665956F31B38B256003E97A1 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956DC1B38B256003E97A1 /* EZMicrophone.m */; };
+		665956F41B38B256003E97A1 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956DE1B38B256003E97A1 /* EZOutput.m */; };
+		665956F51B38B256003E97A1 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956E01B38B256003E97A1 /* EZPlot.m */; };
+		665956F61B38B256003E97A1 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 665956E21B38B256003E97A1 /* EZRecorder.m */; };
+		665956F71B38B256003E97A1 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 665956E31B38B256003E97A1 /* TPCircularBuffer.c */; };
+		665956F81B38B256003E97A1 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 665956E61B38B256003E97A1 /* CHANGELOG */; };
+		665956F91B38B256003E97A1 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 665956E71B38B256003E97A1 /* VERSION */; };
 		94056D88185B97E300EB94BA /* CoreGraphicsWaveformViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94056D86185B97E300EB94BA /* CoreGraphicsWaveformViewController.m */; };
 		94056D89185B97E300EB94BA /* CoreGraphicsWaveformViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94056D87185B97E300EB94BA /* CoreGraphicsWaveformViewController.xib */; };
 		94373025185B931C00F315F0 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94373024185B931C00F315F0 /* Cocoa.framework */; };
@@ -70,38 +71,40 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		66755A0D1B3B790D0013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		66755A0E1B3B790D0013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		66755A0F1B3B790D0013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		66755A101B3B790D0013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		66755A111B3B790D0013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		66755A121B3B790D0013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		66755A131B3B790D0013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		66755A141B3B790D0013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		66755A151B3B790D0013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		66755A161B3B790D0013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		66755A171B3B790D0013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		66755A181B3B790D0013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		66755A191B3B790D0013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		66755A1A1B3B790D0013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		66755A1B1B3B790D0013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		66755A1C1B3B790D0013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		66755A1D1B3B790D0013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		66755A1E1B3B790D0013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		66755A211B3B790D0013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		66755A221B3B790D0013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		66755A231B3B790D0013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		66755A241B3B790D0013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		66755A251B3B790D0013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		66755A261B3B790D0013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		66755A271B3B790D0013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		66755A281B3B790D0013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		66755A291B3B790D0013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		66755A2A1B3B790D0013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		66755A2B1B3B790D0013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		66755A2C1B3B790D0013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		66755A2E1B3B790D0013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		66755A2F1B3B790D0013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		665956C51B38B256003E97A1 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		665956C61B38B256003E97A1 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		665956C71B38B256003E97A1 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		665956C81B38B256003E97A1 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		665956C91B38B256003E97A1 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		665956CA1B38B256003E97A1 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		665956CB1B38B256003E97A1 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		665956CC1B38B256003E97A1 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		665956CD1B38B256003E97A1 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		665956CE1B38B256003E97A1 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		665956CF1B38B256003E97A1 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		665956D01B38B256003E97A1 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		665956D11B38B256003E97A1 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		665956D21B38B256003E97A1 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		665956D31B38B256003E97A1 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		665956D41B38B256003E97A1 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		665956D51B38B256003E97A1 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		665956D61B38B256003E97A1 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		665956D71B38B256003E97A1 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		665956D81B38B256003E97A1 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		665956D91B38B256003E97A1 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		665956DA1B38B256003E97A1 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		665956DB1B38B256003E97A1 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		665956DC1B38B256003E97A1 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		665956DD1B38B256003E97A1 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		665956DE1B38B256003E97A1 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		665956DF1B38B256003E97A1 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		665956E01B38B256003E97A1 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		665956E11B38B256003E97A1 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		665956E21B38B256003E97A1 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		665956E31B38B256003E97A1 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		665956E41B38B256003E97A1 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		665956E61B38B256003E97A1 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		665956E71B38B256003E97A1 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		94056D85185B97E300EB94BA /* CoreGraphicsWaveformViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CoreGraphicsWaveformViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		94056D86185B97E300EB94BA /* CoreGraphicsWaveformViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CoreGraphicsWaveformViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		94056D87185B97E300EB94BA /* CoreGraphicsWaveformViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CoreGraphicsWaveformViewController.xib; sourceTree = "<group>"; };
@@ -159,50 +162,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		66755A0A1B3B790D0013E67E /* EZAudio */ = {
+		665956C41B38B256003E97A1 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				66755A0D1B3B790D0013E67E /* EZAudio.h */,
-				66755A0E1B3B790D0013E67E /* EZAudio.m */,
-				66755A0F1B3B790D0013E67E /* EZAudioDevice.h */,
-				66755A101B3B790D0013E67E /* EZAudioDevice.m */,
-				66755A111B3B790D0013E67E /* EZAudioDisplayLink.h */,
-				66755A121B3B790D0013E67E /* EZAudioDisplayLink.m */,
-				66755A131B3B790D0013E67E /* EZAudioFile.h */,
-				66755A141B3B790D0013E67E /* EZAudioFile.m */,
-				66755A151B3B790D0013E67E /* EZAudioFloatConverter.h */,
-				66755A161B3B790D0013E67E /* EZAudioFloatConverter.m */,
-				66755A171B3B790D0013E67E /* EZAudioFloatData.h */,
-				66755A181B3B790D0013E67E /* EZAudioFloatData.m */,
-				66755A191B3B790D0013E67E /* EZAudioPlayer.h */,
-				66755A1A1B3B790D0013E67E /* EZAudioPlayer.m */,
-				66755A1B1B3B790D0013E67E /* EZAudioPlot.h */,
-				66755A1C1B3B790D0013E67E /* EZAudioPlot.m */,
-				66755A1D1B3B790D0013E67E /* EZAudioPlotGL.h */,
-				66755A1E1B3B790D0013E67E /* EZAudioPlotGL.m */,
-				66755A211B3B790D0013E67E /* EZAudioUtilities.h */,
-				66755A221B3B790D0013E67E /* EZAudioUtilities.m */,
-				66755A231B3B790D0013E67E /* EZMicrophone.h */,
-				66755A241B3B790D0013E67E /* EZMicrophone.m */,
-				66755A251B3B790D0013E67E /* EZOutput.h */,
-				66755A261B3B790D0013E67E /* EZOutput.m */,
-				66755A271B3B790D0013E67E /* EZPlot.h */,
-				66755A281B3B790D0013E67E /* EZPlot.m */,
-				66755A291B3B790D0013E67E /* EZRecorder.h */,
-				66755A2A1B3B790D0013E67E /* EZRecorder.m */,
-				66755A2B1B3B790D0013E67E /* TPCircularBuffer.c */,
-				66755A2C1B3B790D0013E67E /* TPCircularBuffer.h */,
-				66755A2D1B3B790D0013E67E /* VERSION */,
+				665956C51B38B256003E97A1 /* AEFloatConverter.h */,
+				665956C61B38B256003E97A1 /* AEFloatConverter.m */,
+				665956C71B38B256003E97A1 /* EZAudio.h */,
+				665956C81B38B256003E97A1 /* EZAudio.m */,
+				665956C91B38B256003E97A1 /* EZAudioDevice.h */,
+				665956CA1B38B256003E97A1 /* EZAudioDevice.m */,
+				665956CB1B38B256003E97A1 /* EZAudioFile.h */,
+				665956CC1B38B256003E97A1 /* EZAudioFile.m */,
+				665956CD1B38B256003E97A1 /* EZAudioFloatConverter.h */,
+				665956CE1B38B256003E97A1 /* EZAudioFloatConverter.m */,
+				665956CF1B38B256003E97A1 /* EZAudioFloatData.h */,
+				665956D01B38B256003E97A1 /* EZAudioFloatData.m */,
+				665956D11B38B256003E97A1 /* EZAudioPlayer.h */,
+				665956D21B38B256003E97A1 /* EZAudioPlayer.m */,
+				665956D31B38B256003E97A1 /* EZAudioPlot.h */,
+				665956D41B38B256003E97A1 /* EZAudioPlot.m */,
+				665956D51B38B256003E97A1 /* EZAudioPlotGL.h */,
+				665956D61B38B256003E97A1 /* EZAudioPlotGL.m */,
+				665956D71B38B256003E97A1 /* EZAudioPlotGLKViewController.h */,
+				665956D81B38B256003E97A1 /* EZAudioPlotGLKViewController.m */,
+				665956D91B38B256003E97A1 /* EZAudioUtilities.h */,
+				665956DA1B38B256003E97A1 /* EZAudioUtilities.m */,
+				665956DB1B38B256003E97A1 /* EZMicrophone.h */,
+				665956DC1B38B256003E97A1 /* EZMicrophone.m */,
+				665956DD1B38B256003E97A1 /* EZOutput.h */,
+				665956DE1B38B256003E97A1 /* EZOutput.m */,
+				665956DF1B38B256003E97A1 /* EZPlot.h */,
+				665956E01B38B256003E97A1 /* EZPlot.m */,
+				665956E11B38B256003E97A1 /* EZRecorder.h */,
+				665956E21B38B256003E97A1 /* EZRecorder.m */,
+				665956E31B38B256003E97A1 /* TPCircularBuffer.c */,
+				665956E41B38B256003E97A1 /* TPCircularBuffer.h */,
+				665956E51B38B256003E97A1 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		66755A2D1B3B790D0013E67E /* VERSION */ = {
+		665956E51B38B256003E97A1 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				66755A2E1B3B790D0013E67E /* CHANGELOG */,
-				66755A2F1B3B790D0013E67E /* VERSION */,
+				665956E61B38B256003E97A1 /* CHANGELOG */,
+				665956E71B38B256003E97A1 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -255,7 +260,7 @@
 		9437302A185B931C00F315F0 /* EZAudioCoreGraphicsWaveformExample */ = {
 			isa = PBXGroup;
 			children = (
-				66755A0A1B3B790D0013E67E /* EZAudio */,
+				665956C41B38B256003E97A1 /* EZAudio */,
 				94373036185B931C00F315F0 /* AppDelegate.h */,
 				94373037185B931C00F315F0 /* AppDelegate.m */,
 				94056D85185B97E300EB94BA /* CoreGraphicsWaveformViewController.h */,
@@ -376,12 +381,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				9437302F185B931C00F315F0 /* InfoPlist.strings in Resources */,
-				66755A421B3B790D0013E67E /* VERSION in Resources */,
+				665956F91B38B256003E97A1 /* VERSION in Resources */,
 				9437303D185B931C00F315F0 /* Images.xcassets in Resources */,
 				94373035185B931C00F315F0 /* Credits.rtf in Resources */,
 				94056D89185B97E300EB94BA /* CoreGraphicsWaveformViewController.xib in Resources */,
 				9437303B185B931C00F315F0 /* MainMenu.xib in Resources */,
-				66755A411B3B790D0013E67E /* CHANGELOG in Resources */,
+				665956F81B38B256003E97A1 /* CHANGELOG in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -416,24 +421,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				66755A381B3B790D0013E67E /* EZAudioPlot.m in Sources */,
-				66755A371B3B790D0013E67E /* EZAudioPlayer.m in Sources */,
+				665956F61B38B256003E97A1 /* EZRecorder.m in Sources */,
 				94056D88185B97E300EB94BA /* CoreGraphicsWaveformViewController.m in Sources */,
-				66755A391B3B790D0013E67E /* EZAudioPlotGL.m in Sources */,
-				66755A341B3B790D0013E67E /* EZAudioFile.m in Sources */,
-				66755A3D1B3B790D0013E67E /* EZOutput.m in Sources */,
-				66755A3B1B3B790D0013E67E /* EZAudioUtilities.m in Sources */,
-				66755A3E1B3B790D0013E67E /* EZPlot.m in Sources */,
+				665956EC1B38B256003E97A1 /* EZAudioFloatConverter.m in Sources */,
+				665956ED1B38B256003E97A1 /* EZAudioFloatData.m in Sources */,
+				665956E81B38B256003E97A1 /* AEFloatConverter.m in Sources */,
+				665956EB1B38B256003E97A1 /* EZAudioFile.m in Sources */,
+				665956F41B38B256003E97A1 /* EZOutput.m in Sources */,
+				665956F01B38B256003E97A1 /* EZAudioPlotGL.m in Sources */,
+				665956F71B38B256003E97A1 /* TPCircularBuffer.c in Sources */,
+				665956EF1B38B256003E97A1 /* EZAudioPlot.m in Sources */,
 				94373038185B931C00F315F0 /* AppDelegate.m in Sources */,
-				66755A3F1B3B790D0013E67E /* EZRecorder.m in Sources */,
-				66755A361B3B790D0013E67E /* EZAudioFloatData.m in Sources */,
-				66755A351B3B790D0013E67E /* EZAudioFloatConverter.m in Sources */,
-				66755A331B3B790D0013E67E /* EZAudioDisplayLink.m in Sources */,
-				66755A3C1B3B790D0013E67E /* EZMicrophone.m in Sources */,
-				66755A321B3B790D0013E67E /* EZAudioDevice.m in Sources */,
+				665956F31B38B256003E97A1 /* EZMicrophone.m in Sources */,
+				665956EE1B38B256003E97A1 /* EZAudioPlayer.m in Sources */,
+				665956EA1B38B256003E97A1 /* EZAudioDevice.m in Sources */,
 				94373031185B931C00F315F0 /* main.m in Sources */,
-				66755A401B3B790D0013E67E /* TPCircularBuffer.c in Sources */,
-				66755A311B3B790D0013E67E /* EZAudio.m in Sources */,
+				665956F51B38B256003E97A1 /* EZPlot.m in Sources */,
+				665956E91B38B256003E97A1 /* EZAudio.m in Sources */,
+				665956F21B38B256003E97A1 /* EZAudioUtilities.m in Sources */,
+				665956F11B38B256003E97A1 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

EZAudioExamples/OSX/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/Base.lproj/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -648,8 +648,7 @@
             </items>
         </menu>
         <window title="EZAudioCoreGraphicsWaveformExample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
-            <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>

EZAudioExamples/OSX/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/CoreGraphicsWaveformViewController.h

@@ -57,11 +57,6 @@
  */
 @property (nonatomic, weak) IBOutlet NSPopUpButton *microphoneInputChannelPopUpButton;
 
-/**
- The checkbox button used to turn the microphone off/on
- */
-@property (nonatomic, weak) IBOutlet NSButton *microphoneSwitch;
-
 //------------------------------------------------------------------------------
 #pragma mark - Actions
 //------------------------------------------------------------------------------

EZAudioExamples/OSX/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/CoreGraphicsWaveformViewController.m

@@ -102,8 +102,10 @@
     for (int i = 0; i < self.microphone.device.inputChannelCount; i++)
     {
         NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@(i).stringValue
-                                                      action:nil
+                                                      action:@selector(changedInputChannel:)
                                                keyEquivalent:@""];
+        item.representedObject = @(i);
+        item.target = self;
         [menu addItem:item];
     }
     self.microphoneInputChannelPopUpButton.menu = menu;
@@ -122,6 +124,12 @@
 
 //------------------------------------------------------------------------------
 
+- (void)changedInputChannel:(id)sender
+{
+}
+
+//------------------------------------------------------------------------------
+
 - (void)changePlotType:(id)sender
 {
     NSInteger selectedSegment = [sender selectedSegment];
@@ -155,10 +163,7 @@
     }
 }
 
-//------------------------------------------------------------------------------
 #pragma mark - Action Extensions
-//------------------------------------------------------------------------------
-
 /*
  Give the visualization of the current buffer (this is almost exactly the openFrameworks audio input eample)
  */
@@ -184,10 +189,10 @@
 #pragma mark - EZMicrophoneDelegate
 #warning Thread Safety
 // Note that any callback that provides streamed audio data (like streaming microphone input) happens on a separate audio thread that should not be blocked. When we feed audio data into any of the UI components we need to explicity create a GCD block on the main thread to properly get the UI to work.
-- (void)   microphone:(EZMicrophone *)microphone
-     hasAudioReceived:(float **)buffer
-       withBufferSize:(UInt32)bufferSize
- withNumberOfChannels:(UInt32)numberOfChannels
+- (void)microphone:(EZMicrophone *)microphone
+  hasAudioReceived:(float **)buffer
+    withBufferSize:(UInt32)bufferSize
+withNumberOfChannels:(UInt32)numberOfChannels
 {
     // See the Thread Safety warning above, but in a nutshell these callbacks happen on a separate audio thread. We wrap any UI updating in a GCD block on the main thread to avoid blocking that audio flow.
     __weak typeof(self) weakSelf = self;
@@ -222,43 +227,21 @@ withNumberOfChannels:(UInt32)numberOfChannels
 - (void)microphone:(EZMicrophone *)microphone
      changedDevice:(EZAudioDevice *)device
 {
-    __weak typeof (self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
         //
         // Set up the microphone input popup button's items to select
         // between different microphone inputs
         //
-        [weakSelf reloadMicrophoneInputPopUpButtonMenu];
+        [self reloadMicrophoneInputPopUpButtonMenu];
         
         //
         // Set up the microphone input popup button's items to select
         // between different microphone input channels
         //
-        [weakSelf reloadMicrophoneInputChannelPopUpButtonMenu];
+        [self reloadMicrophoneInputChannelPopUpButtonMenu];
     });
 }
 
 //------------------------------------------------------------------------------
 
-- (void)microphone:(EZMicrophone *)microphone changedPlayingState:(BOOL)isPlaying
-{
-    NSString *title = isPlaying ? @"Microphone On" : @"Microphone Off";
-    [self setTitle:title forButton:self.microphoneSwitch];
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Utility
-//------------------------------------------------------------------------------
-
-- (void)setTitle:(NSString *)title forButton:(NSButton *)button
-{
-    NSDictionary *attributes = @{ NSForegroundColorAttributeName : [NSColor whiteColor] };
-    NSAttributedString *attributedTitle = [[NSAttributedString alloc] initWithString:title
-                                                                          attributes:attributes];
-    button.attributedTitle = attributedTitle;
-    button.attributedAlternateTitle = attributedTitle;
-}
-
-//------------------------------------------------------------------------------
-
 @end

EZAudioExamples/OSX/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/CoreGraphicsWaveformViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="CoreGraphicsWaveformViewController">
@@ -10,7 +10,6 @@
                 <outlet property="audioPlot" destination="wpL-Ou-GSb" id="OME-Hf-I27"/>
                 <outlet property="microphoneInputChannelPopUpButton" destination="Yi6-fS-Cob" id="pLg-4c-klV"/>
                 <outlet property="microphoneInputPopUpButton" destination="SjR-qx-mWV" id="NuN-SS-ESg"/>
-                <outlet property="microphoneSwitch" destination="kAI-gs-c31" id="ADZ-Fg-aCN"/>
                 <outlet property="view" destination="wpL-Ou-GSb" id="oxJ-iT-SKO"/>
             </connections>
         </customObject>
@@ -81,18 +80,18 @@
                     </popUpButtonCell>
                 </popUpButton>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fi6-Uh-bvr">
-                    <rect key="frame" x="18" y="43" width="36" height="17"/>
+                    <rect key="frame" x="18" y="43" width="31" height="14"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Input" id="Png-Pk-fMc">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HVN-Im-3J1">
-                    <rect key="frame" x="204" y="43" width="55" height="17"/>
+                    <rect key="frame" x="204" y="43" width="48" height="14"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Channel" id="lkh-zp-WCY">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
@@ -112,7 +111,7 @@
                 <constraint firstItem="SjR-qx-mWV" firstAttribute="top" secondItem="fi6-Uh-bvr" secondAttribute="bottom" constant="5" id="qkS-wp-O0d"/>
                 <constraint firstAttribute="trailing" secondItem="HTa-6n-EPo" secondAttribute="trailing" constant="20" id="rGZ-5W-ZDN"/>
             </constraints>
-            <point key="canvasLocation" x="226" y="324"/>
+            <point key="canvasLocation" x="178" y="314"/>
         </customView>
     </objects>
 </document>

EZAudioExamples/OSX/EZAudioFFTExample/EZAudioFFTExample.xcodeproj/project.pbxproj

@@ -7,23 +7,24 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		66755B871B3B79380013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B641B3B79380013E67E /* EZAudio.m */; };
-		66755B881B3B79380013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B661B3B79380013E67E /* EZAudioDevice.m */; };
-		66755B891B3B79380013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B681B3B79380013E67E /* EZAudioDisplayLink.m */; };
-		66755B8A1B3B79380013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B6A1B3B79380013E67E /* EZAudioFile.m */; };
-		66755B8B1B3B79380013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B6C1B3B79380013E67E /* EZAudioFloatConverter.m */; };
-		66755B8C1B3B79380013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B6E1B3B79380013E67E /* EZAudioFloatData.m */; };
-		66755B8D1B3B79380013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B701B3B79380013E67E /* EZAudioPlayer.m */; };
-		66755B8E1B3B79380013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B721B3B79380013E67E /* EZAudioPlot.m */; };
-		66755B8F1B3B79380013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B741B3B79380013E67E /* EZAudioPlotGL.m */; };
-		66755B911B3B79380013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B781B3B79380013E67E /* EZAudioUtilities.m */; };
-		66755B921B3B79380013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B7A1B3B79380013E67E /* EZMicrophone.m */; };
-		66755B931B3B79380013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B7C1B3B79380013E67E /* EZOutput.m */; };
-		66755B941B3B79380013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B7E1B3B79380013E67E /* EZPlot.m */; };
-		66755B951B3B79380013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B801B3B79380013E67E /* EZRecorder.m */; };
-		66755B961B3B79380013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 66755B811B3B79380013E67E /* TPCircularBuffer.c */; };
-		66755B971B3B79380013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 66755B841B3B79380013E67E /* CHANGELOG */; };
-		66755B981B3B79380013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 66755B851B3B79380013E67E /* VERSION */; };
+		6628E2C61B3A1CCE00020E56 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2A41B3A1CCE00020E56 /* AEFloatConverter.m */; };
+		6628E2C71B3A1CCE00020E56 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2A61B3A1CCE00020E56 /* EZAudio.m */; };
+		6628E2C81B3A1CCE00020E56 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2A81B3A1CCE00020E56 /* EZAudioDevice.m */; };
+		6628E2C91B3A1CCE00020E56 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2AA1B3A1CCE00020E56 /* EZAudioFile.m */; };
+		6628E2CA1B3A1CCE00020E56 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2AC1B3A1CCE00020E56 /* EZAudioFloatConverter.m */; };
+		6628E2CB1B3A1CCE00020E56 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2AE1B3A1CCE00020E56 /* EZAudioFloatData.m */; };
+		6628E2CC1B3A1CCE00020E56 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2B01B3A1CCE00020E56 /* EZAudioPlayer.m */; };
+		6628E2CD1B3A1CCE00020E56 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2B21B3A1CCE00020E56 /* EZAudioPlot.m */; };
+		6628E2CE1B3A1CCE00020E56 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2B41B3A1CCE00020E56 /* EZAudioPlotGL.m */; };
+		6628E2CF1B3A1CCE00020E56 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2B61B3A1CCE00020E56 /* EZAudioPlotGLKViewController.m */; };
+		6628E2D01B3A1CCE00020E56 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2B81B3A1CCE00020E56 /* EZAudioUtilities.m */; };
+		6628E2D11B3A1CCE00020E56 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2BA1B3A1CCE00020E56 /* EZMicrophone.m */; };
+		6628E2D21B3A1CCE00020E56 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2BC1B3A1CCE00020E56 /* EZOutput.m */; };
+		6628E2D31B3A1CCE00020E56 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2BE1B3A1CCE00020E56 /* EZPlot.m */; };
+		6628E2D41B3A1CCE00020E56 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2C01B3A1CCE00020E56 /* EZRecorder.m */; };
+		6628E2D51B3A1CCE00020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2C11B3A1CCE00020E56 /* TPCircularBuffer.c */; };
+		6628E2D61B3A1CCE00020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2C41B3A1CCE00020E56 /* CHANGELOG */; };
+		6628E2D71B3A1CCE00020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2C51B3A1CCE00020E56 /* VERSION */; };
 		9417A8F71871492000D9D37B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A8F61871492000D9D37B /* Cocoa.framework */; };
 		9417A9011871492000D9D37B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9417A8FF1871492000D9D37B /* InfoPlist.strings */; };
 		9417A9031871492000D9D37B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9417A9021871492000D9D37B /* main.m */; };
@@ -57,38 +58,40 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		66755B631B3B79380013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		66755B641B3B79380013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		66755B651B3B79380013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		66755B661B3B79380013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		66755B671B3B79380013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		66755B681B3B79380013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		66755B691B3B79380013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		66755B6A1B3B79380013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		66755B6B1B3B79380013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		66755B6C1B3B79380013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		66755B6D1B3B79380013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		66755B6E1B3B79380013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		66755B6F1B3B79380013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		66755B701B3B79380013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		66755B711B3B79380013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		66755B721B3B79380013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		66755B731B3B79380013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		66755B741B3B79380013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		66755B771B3B79380013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		66755B781B3B79380013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		66755B791B3B79380013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		66755B7A1B3B79380013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		66755B7B1B3B79380013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		66755B7C1B3B79380013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		66755B7D1B3B79380013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		66755B7E1B3B79380013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		66755B7F1B3B79380013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		66755B801B3B79380013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		66755B811B3B79380013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		66755B821B3B79380013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		66755B841B3B79380013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		66755B851B3B79380013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E2A31B3A1CCE00020E56 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		6628E2A41B3A1CCE00020E56 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		6628E2A51B3A1CCE00020E56 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		6628E2A61B3A1CCE00020E56 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		6628E2A71B3A1CCE00020E56 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		6628E2A81B3A1CCE00020E56 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		6628E2A91B3A1CCE00020E56 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		6628E2AA1B3A1CCE00020E56 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		6628E2AB1B3A1CCE00020E56 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		6628E2AC1B3A1CCE00020E56 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		6628E2AD1B3A1CCE00020E56 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		6628E2AE1B3A1CCE00020E56 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		6628E2AF1B3A1CCE00020E56 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		6628E2B01B3A1CCE00020E56 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		6628E2B11B3A1CCE00020E56 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		6628E2B21B3A1CCE00020E56 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		6628E2B31B3A1CCE00020E56 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		6628E2B41B3A1CCE00020E56 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		6628E2B51B3A1CCE00020E56 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		6628E2B61B3A1CCE00020E56 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		6628E2B71B3A1CCE00020E56 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		6628E2B81B3A1CCE00020E56 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		6628E2B91B3A1CCE00020E56 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		6628E2BA1B3A1CCE00020E56 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		6628E2BB1B3A1CCE00020E56 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		6628E2BC1B3A1CCE00020E56 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		6628E2BD1B3A1CCE00020E56 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		6628E2BE1B3A1CCE00020E56 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		6628E2BF1B3A1CCE00020E56 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		6628E2C01B3A1CCE00020E56 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		6628E2C11B3A1CCE00020E56 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		6628E2C21B3A1CCE00020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		6628E2C41B3A1CCE00020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		6628E2C51B3A1CCE00020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		9417A8F31871492000D9D37B /* EZAudioFFTExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioFFTExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9417A8F61871492000D9D37B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		9417A8F91871492000D9D37B /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -148,50 +151,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		66755B601B3B79380013E67E /* EZAudio */ = {
+		6628E2A21B3A1CCE00020E56 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				66755B631B3B79380013E67E /* EZAudio.h */,
-				66755B641B3B79380013E67E /* EZAudio.m */,
-				66755B651B3B79380013E67E /* EZAudioDevice.h */,
-				66755B661B3B79380013E67E /* EZAudioDevice.m */,
-				66755B671B3B79380013E67E /* EZAudioDisplayLink.h */,
-				66755B681B3B79380013E67E /* EZAudioDisplayLink.m */,
-				66755B691B3B79380013E67E /* EZAudioFile.h */,
-				66755B6A1B3B79380013E67E /* EZAudioFile.m */,
-				66755B6B1B3B79380013E67E /* EZAudioFloatConverter.h */,
-				66755B6C1B3B79380013E67E /* EZAudioFloatConverter.m */,
-				66755B6D1B3B79380013E67E /* EZAudioFloatData.h */,
-				66755B6E1B3B79380013E67E /* EZAudioFloatData.m */,
-				66755B6F1B3B79380013E67E /* EZAudioPlayer.h */,
-				66755B701B3B79380013E67E /* EZAudioPlayer.m */,
-				66755B711B3B79380013E67E /* EZAudioPlot.h */,
-				66755B721B3B79380013E67E /* EZAudioPlot.m */,
-				66755B731B3B79380013E67E /* EZAudioPlotGL.h */,
-				66755B741B3B79380013E67E /* EZAudioPlotGL.m */,
-				66755B771B3B79380013E67E /* EZAudioUtilities.h */,
-				66755B781B3B79380013E67E /* EZAudioUtilities.m */,
-				66755B791B3B79380013E67E /* EZMicrophone.h */,
-				66755B7A1B3B79380013E67E /* EZMicrophone.m */,
-				66755B7B1B3B79380013E67E /* EZOutput.h */,
-				66755B7C1B3B79380013E67E /* EZOutput.m */,
-				66755B7D1B3B79380013E67E /* EZPlot.h */,
-				66755B7E1B3B79380013E67E /* EZPlot.m */,
-				66755B7F1B3B79380013E67E /* EZRecorder.h */,
-				66755B801B3B79380013E67E /* EZRecorder.m */,
-				66755B811B3B79380013E67E /* TPCircularBuffer.c */,
-				66755B821B3B79380013E67E /* TPCircularBuffer.h */,
-				66755B831B3B79380013E67E /* VERSION */,
+				6628E2A31B3A1CCE00020E56 /* AEFloatConverter.h */,
+				6628E2A41B3A1CCE00020E56 /* AEFloatConverter.m */,
+				6628E2A51B3A1CCE00020E56 /* EZAudio.h */,
+				6628E2A61B3A1CCE00020E56 /* EZAudio.m */,
+				6628E2A71B3A1CCE00020E56 /* EZAudioDevice.h */,
+				6628E2A81B3A1CCE00020E56 /* EZAudioDevice.m */,
+				6628E2A91B3A1CCE00020E56 /* EZAudioFile.h */,
+				6628E2AA1B3A1CCE00020E56 /* EZAudioFile.m */,
+				6628E2AB1B3A1CCE00020E56 /* EZAudioFloatConverter.h */,
+				6628E2AC1B3A1CCE00020E56 /* EZAudioFloatConverter.m */,
+				6628E2AD1B3A1CCE00020E56 /* EZAudioFloatData.h */,
+				6628E2AE1B3A1CCE00020E56 /* EZAudioFloatData.m */,
+				6628E2AF1B3A1CCE00020E56 /* EZAudioPlayer.h */,
+				6628E2B01B3A1CCE00020E56 /* EZAudioPlayer.m */,
+				6628E2B11B3A1CCE00020E56 /* EZAudioPlot.h */,
+				6628E2B21B3A1CCE00020E56 /* EZAudioPlot.m */,
+				6628E2B31B3A1CCE00020E56 /* EZAudioPlotGL.h */,
+				6628E2B41B3A1CCE00020E56 /* EZAudioPlotGL.m */,
+				6628E2B51B3A1CCE00020E56 /* EZAudioPlotGLKViewController.h */,
+				6628E2B61B3A1CCE00020E56 /* EZAudioPlotGLKViewController.m */,
+				6628E2B71B3A1CCE00020E56 /* EZAudioUtilities.h */,
+				6628E2B81B3A1CCE00020E56 /* EZAudioUtilities.m */,
+				6628E2B91B3A1CCE00020E56 /* EZMicrophone.h */,
+				6628E2BA1B3A1CCE00020E56 /* EZMicrophone.m */,
+				6628E2BB1B3A1CCE00020E56 /* EZOutput.h */,
+				6628E2BC1B3A1CCE00020E56 /* EZOutput.m */,
+				6628E2BD1B3A1CCE00020E56 /* EZPlot.h */,
+				6628E2BE1B3A1CCE00020E56 /* EZPlot.m */,
+				6628E2BF1B3A1CCE00020E56 /* EZRecorder.h */,
+				6628E2C01B3A1CCE00020E56 /* EZRecorder.m */,
+				6628E2C11B3A1CCE00020E56 /* TPCircularBuffer.c */,
+				6628E2C21B3A1CCE00020E56 /* TPCircularBuffer.h */,
+				6628E2C31B3A1CCE00020E56 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		66755B831B3B79380013E67E /* VERSION */ = {
+		6628E2C31B3A1CCE00020E56 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				66755B841B3B79380013E67E /* CHANGELOG */,
-				66755B851B3B79380013E67E /* VERSION */,
+				6628E2C41B3A1CCE00020E56 /* CHANGELOG */,
+				6628E2C51B3A1CCE00020E56 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -245,7 +250,7 @@
 		9417A8FC1871492000D9D37B /* EZAudioFFTExample */ = {
 			isa = PBXGroup;
 			children = (
-				66755B601B3B79380013E67E /* EZAudio */,
+				6628E2A21B3A1CCE00020E56 /* EZAudio */,
 				9417A9081871492100D9D37B /* AppDelegate.h */,
 				9417A9091871492100D9D37B /* AppDelegate.m */,
 				9417A9D31872130200D9D37B /* FFTViewController.h */,
@@ -365,12 +370,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				9417A9011871492000D9D37B /* InfoPlist.strings in Resources */,
-				66755B981B3B79380013E67E /* VERSION in Resources */,
+				6628E2D71B3A1CCE00020E56 /* VERSION in Resources */,
 				9417A9D71872130200D9D37B /* FFTViewController.xib in Resources */,
 				9417A90F1871492100D9D37B /* Images.xcassets in Resources */,
 				9417A9071871492100D9D37B /* Credits.rtf in Resources */,
 				9417A90D1871492100D9D37B /* MainMenu.xib in Resources */,
-				66755B971B3B79380013E67E /* CHANGELOG in Resources */,
+				6628E2D61B3A1CCE00020E56 /* CHANGELOG in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -389,24 +394,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				66755B8E1B3B79380013E67E /* EZAudioPlot.m in Sources */,
-				66755B8D1B3B79380013E67E /* EZAudioPlayer.m in Sources */,
+				6628E2D41B3A1CCE00020E56 /* EZRecorder.m in Sources */,
 				9417A9D61872130200D9D37B /* FFTViewController.m in Sources */,
-				66755B8F1B3B79380013E67E /* EZAudioPlotGL.m in Sources */,
-				66755B8A1B3B79380013E67E /* EZAudioFile.m in Sources */,
-				66755B931B3B79380013E67E /* EZOutput.m in Sources */,
-				66755B911B3B79380013E67E /* EZAudioUtilities.m in Sources */,
-				66755B941B3B79380013E67E /* EZPlot.m in Sources */,
+				6628E2CA1B3A1CCE00020E56 /* EZAudioFloatConverter.m in Sources */,
+				6628E2CB1B3A1CCE00020E56 /* EZAudioFloatData.m in Sources */,
+				6628E2C61B3A1CCE00020E56 /* AEFloatConverter.m in Sources */,
+				6628E2C91B3A1CCE00020E56 /* EZAudioFile.m in Sources */,
+				6628E2D21B3A1CCE00020E56 /* EZOutput.m in Sources */,
+				6628E2CE1B3A1CCE00020E56 /* EZAudioPlotGL.m in Sources */,
+				6628E2D51B3A1CCE00020E56 /* TPCircularBuffer.c in Sources */,
+				6628E2CD1B3A1CCE00020E56 /* EZAudioPlot.m in Sources */,
 				9417A90A1871492100D9D37B /* AppDelegate.m in Sources */,
-				66755B951B3B79380013E67E /* EZRecorder.m in Sources */,
-				66755B8C1B3B79380013E67E /* EZAudioFloatData.m in Sources */,
-				66755B8B1B3B79380013E67E /* EZAudioFloatConverter.m in Sources */,
-				66755B891B3B79380013E67E /* EZAudioDisplayLink.m in Sources */,
-				66755B921B3B79380013E67E /* EZMicrophone.m in Sources */,
-				66755B881B3B79380013E67E /* EZAudioDevice.m in Sources */,
+				6628E2D11B3A1CCE00020E56 /* EZMicrophone.m in Sources */,
+				6628E2CC1B3A1CCE00020E56 /* EZAudioPlayer.m in Sources */,
+				6628E2C81B3A1CCE00020E56 /* EZAudioDevice.m in Sources */,
 				9417A9031871492000D9D37B /* main.m in Sources */,
-				66755B961B3B79380013E67E /* TPCircularBuffer.c in Sources */,
-				66755B871B3B79380013E67E /* EZAudio.m in Sources */,
+				6628E2D31B3A1CCE00020E56 /* EZPlot.m in Sources */,
+				6628E2C71B3A1CCE00020E56 /* EZAudio.m in Sources */,
+				6628E2D01B3A1CCE00020E56 /* EZAudioUtilities.m in Sources */,
+				6628E2CF1B3A1CCE00020E56 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

EZAudioExamples/OSX/EZAudioFFTExample/EZAudioFFTExample/Base.lproj/MainMenu.xib

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +10,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="-3" userLabel="Application"/>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
                 <menuItem title="EZAudioFFTExample" id="56">
@@ -648,10 +647,10 @@
             </items>
         </menu>
         <window title="EZAudioFFTExample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
             <view key="contentView" id="372">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>

EZAudioExamples/OSX/EZAudioFFTExample/EZAudioFFTExample/FFTViewController.h

@@ -44,7 +44,7 @@
 /**
  EZAudioPlot for frequency plot
  */
-@property (nonatomic,weak) IBOutlet EZAudioPlot *audioPlotFreq;
+@property (nonatomic,weak) IBOutlet EZAudioPlotGL *audioPlotFreq;
 
 /**
  EZAudioPlot for time plot

EZAudioExamples/OSX/EZAudioFFTExample/EZAudioFFTExample/FFTViewController.m

@@ -62,11 +62,10 @@
     //
     // Setup frequency domain audio plot
     //
-    self.audioPlotFreq.backgroundColor   = [NSColor colorWithCalibratedRed: 0.984 green: 0.471 blue: 0.525 alpha: 1];
-    self.audioPlotFreq.color             = [NSColor colorWithCalibratedRed:1.0 green:1.0 blue:1.0 alpha:1.0];
-    self.audioPlotFreq.shouldFill        = YES;
-    self.audioPlotFreq.plotType          = EZPlotTypeBuffer;
-    self.audioPlotFreq.shouldCenterYAxis = NO;
+    self.audioPlotFreq.backgroundColor = [NSColor colorWithCalibratedRed: 0.984 green: 0.471 blue: 0.525 alpha: 1];
+    self.audioPlotFreq.color           = [NSColor colorWithCalibratedRed:1.0 green:1.0 blue:1.0 alpha:1.0];
+    self.audioPlotFreq.shouldFill      = YES;
+    self.audioPlotFreq.plotType        = EZPlotTypeBuffer;
   
     //
     // Create an instance of the microphone and tell it to use this view controller instance as the delegate

EZAudioExamples/OSX/EZAudioFFTExample/EZAudioFFTExample/FFTViewController.xib

@@ -25,7 +25,7 @@
                             <rect key="frame" x="0.0" y="0.0" width="480" height="132"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </customView>
-                        <customView fixedFrame="YES" id="4V2-1I-w64" customClass="EZAudioPlot">
+                        <customView fixedFrame="YES" id="4V2-1I-w64" customClass="EZAudioPlotGL">
                             <rect key="frame" x="0.0" y="133" width="480" height="139"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </customView>

EZAudioExamples/OSX/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample.xcodeproj/project.pbxproj

@@ -7,23 +7,24 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		66755A6A1B3B79130013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A471B3B79130013E67E /* EZAudio.m */; };
-		66755A6B1B3B79130013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A491B3B79130013E67E /* EZAudioDevice.m */; };
-		66755A6C1B3B79130013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A4B1B3B79130013E67E /* EZAudioDisplayLink.m */; };
-		66755A6D1B3B79130013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A4D1B3B79130013E67E /* EZAudioFile.m */; };
-		66755A6E1B3B79130013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A4F1B3B79130013E67E /* EZAudioFloatConverter.m */; };
-		66755A6F1B3B79130013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A511B3B79130013E67E /* EZAudioFloatData.m */; };
-		66755A701B3B79130013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A531B3B79130013E67E /* EZAudioPlayer.m */; };
-		66755A711B3B79130013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A551B3B79130013E67E /* EZAudioPlot.m */; };
-		66755A721B3B79130013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A571B3B79130013E67E /* EZAudioPlotGL.m */; };
-		66755A741B3B79130013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A5B1B3B79130013E67E /* EZAudioUtilities.m */; };
-		66755A751B3B79130013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A5D1B3B79130013E67E /* EZMicrophone.m */; };
-		66755A761B3B79130013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A5F1B3B79130013E67E /* EZOutput.m */; };
-		66755A771B3B79130013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A611B3B79130013E67E /* EZPlot.m */; };
-		66755A781B3B79130013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A631B3B79130013E67E /* EZRecorder.m */; };
-		66755A791B3B79130013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 66755A641B3B79130013E67E /* TPCircularBuffer.c */; };
-		66755A7A1B3B79130013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 66755A671B3B79130013E67E /* CHANGELOG */; };
-		66755A7B1B3B79130013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 66755A681B3B79130013E67E /* VERSION */; };
+		665957541B38B2B4003E97A1 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957321B38B2B4003E97A1 /* AEFloatConverter.m */; };
+		665957551B38B2B4003E97A1 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957341B38B2B4003E97A1 /* EZAudio.m */; };
+		665957561B38B2B4003E97A1 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957361B38B2B4003E97A1 /* EZAudioDevice.m */; };
+		665957571B38B2B4003E97A1 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957381B38B2B4003E97A1 /* EZAudioFile.m */; };
+		665957581B38B2B4003E97A1 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659573A1B38B2B4003E97A1 /* EZAudioFloatConverter.m */; };
+		665957591B38B2B4003E97A1 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659573C1B38B2B4003E97A1 /* EZAudioFloatData.m */; };
+		6659575A1B38B2B4003E97A1 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659573E1B38B2B4003E97A1 /* EZAudioPlayer.m */; };
+		6659575B1B38B2B4003E97A1 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957401B38B2B4003E97A1 /* EZAudioPlot.m */; };
+		6659575C1B38B2B4003E97A1 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957421B38B2B4003E97A1 /* EZAudioPlotGL.m */; };
+		6659575D1B38B2B4003E97A1 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957441B38B2B4003E97A1 /* EZAudioPlotGLKViewController.m */; };
+		6659575E1B38B2B4003E97A1 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957461B38B2B4003E97A1 /* EZAudioUtilities.m */; };
+		6659575F1B38B2B4003E97A1 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957481B38B2B4003E97A1 /* EZMicrophone.m */; };
+		665957601B38B2B4003E97A1 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659574A1B38B2B4003E97A1 /* EZOutput.m */; };
+		665957611B38B2B4003E97A1 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659574C1B38B2B4003E97A1 /* EZPlot.m */; };
+		665957621B38B2B4003E97A1 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659574E1B38B2B4003E97A1 /* EZRecorder.m */; };
+		665957631B38B2B4003E97A1 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6659574F1B38B2B4003E97A1 /* TPCircularBuffer.c */; };
+		665957641B38B2B4003E97A1 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 665957521B38B2B4003E97A1 /* CHANGELOG */; };
+		665957651B38B2B4003E97A1 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 665957531B38B2B4003E97A1 /* VERSION */; };
 		94056D97185BB0BC00EB94BA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94056D96185BB0BC00EB94BA /* Cocoa.framework */; };
 		94056DA1185BB0BC00EB94BA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 94056D9F185BB0BC00EB94BA /* InfoPlist.strings */; };
 		94056DA3185BB0BC00EB94BA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 94056DA2185BB0BC00EB94BA /* main.m */; };
@@ -56,38 +57,40 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		66755A461B3B79130013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		66755A471B3B79130013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		66755A481B3B79130013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		66755A491B3B79130013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		66755A4A1B3B79130013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		66755A4B1B3B79130013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		66755A4C1B3B79130013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		66755A4D1B3B79130013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		66755A4E1B3B79130013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		66755A4F1B3B79130013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		66755A501B3B79130013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		66755A511B3B79130013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		66755A521B3B79130013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		66755A531B3B79130013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		66755A541B3B79130013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		66755A551B3B79130013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		66755A561B3B79130013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		66755A571B3B79130013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		66755A5A1B3B79130013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		66755A5B1B3B79130013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		66755A5C1B3B79130013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		66755A5D1B3B79130013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		66755A5E1B3B79130013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		66755A5F1B3B79130013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		66755A601B3B79130013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		66755A611B3B79130013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		66755A621B3B79130013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		66755A631B3B79130013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		66755A641B3B79130013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		66755A651B3B79130013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		66755A671B3B79130013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		66755A681B3B79130013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		665957311B38B2B4003E97A1 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		665957321B38B2B4003E97A1 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		665957331B38B2B4003E97A1 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		665957341B38B2B4003E97A1 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		665957351B38B2B4003E97A1 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		665957361B38B2B4003E97A1 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		665957371B38B2B4003E97A1 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		665957381B38B2B4003E97A1 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		665957391B38B2B4003E97A1 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		6659573A1B38B2B4003E97A1 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		6659573B1B38B2B4003E97A1 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		6659573C1B38B2B4003E97A1 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		6659573D1B38B2B4003E97A1 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		6659573E1B38B2B4003E97A1 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		6659573F1B38B2B4003E97A1 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		665957401B38B2B4003E97A1 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		665957411B38B2B4003E97A1 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		665957421B38B2B4003E97A1 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		665957431B38B2B4003E97A1 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		665957441B38B2B4003E97A1 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		665957451B38B2B4003E97A1 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		665957461B38B2B4003E97A1 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		665957471B38B2B4003E97A1 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		665957481B38B2B4003E97A1 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		665957491B38B2B4003E97A1 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		6659574A1B38B2B4003E97A1 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		6659574B1B38B2B4003E97A1 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		6659574C1B38B2B4003E97A1 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		6659574D1B38B2B4003E97A1 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		6659574E1B38B2B4003E97A1 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		6659574F1B38B2B4003E97A1 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		665957501B38B2B4003E97A1 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		665957521B38B2B4003E97A1 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		665957531B38B2B4003E97A1 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		94056D93185BB0BC00EB94BA /* EZAudioOpenGLWaveformExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioOpenGLWaveformExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		94056D96185BB0BC00EB94BA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		94056D99185BB0BC00EB94BA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -145,50 +148,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		66755A431B3B79120013E67E /* EZAudio */ = {
+		665957301B38B2B4003E97A1 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				66755A461B3B79130013E67E /* EZAudio.h */,
-				66755A471B3B79130013E67E /* EZAudio.m */,
-				66755A481B3B79130013E67E /* EZAudioDevice.h */,
-				66755A491B3B79130013E67E /* EZAudioDevice.m */,
-				66755A4A1B3B79130013E67E /* EZAudioDisplayLink.h */,
-				66755A4B1B3B79130013E67E /* EZAudioDisplayLink.m */,
-				66755A4C1B3B79130013E67E /* EZAudioFile.h */,
-				66755A4D1B3B79130013E67E /* EZAudioFile.m */,
-				66755A4E1B3B79130013E67E /* EZAudioFloatConverter.h */,
-				66755A4F1B3B79130013E67E /* EZAudioFloatConverter.m */,
-				66755A501B3B79130013E67E /* EZAudioFloatData.h */,
-				66755A511B3B79130013E67E /* EZAudioFloatData.m */,
-				66755A521B3B79130013E67E /* EZAudioPlayer.h */,
-				66755A531B3B79130013E67E /* EZAudioPlayer.m */,
-				66755A541B3B79130013E67E /* EZAudioPlot.h */,
-				66755A551B3B79130013E67E /* EZAudioPlot.m */,
-				66755A561B3B79130013E67E /* EZAudioPlotGL.h */,
-				66755A571B3B79130013E67E /* EZAudioPlotGL.m */,
-				66755A5A1B3B79130013E67E /* EZAudioUtilities.h */,
-				66755A5B1B3B79130013E67E /* EZAudioUtilities.m */,
-				66755A5C1B3B79130013E67E /* EZMicrophone.h */,
-				66755A5D1B3B79130013E67E /* EZMicrophone.m */,
-				66755A5E1B3B79130013E67E /* EZOutput.h */,
-				66755A5F1B3B79130013E67E /* EZOutput.m */,
-				66755A601B3B79130013E67E /* EZPlot.h */,
-				66755A611B3B79130013E67E /* EZPlot.m */,
-				66755A621B3B79130013E67E /* EZRecorder.h */,
-				66755A631B3B79130013E67E /* EZRecorder.m */,
-				66755A641B3B79130013E67E /* TPCircularBuffer.c */,
-				66755A651B3B79130013E67E /* TPCircularBuffer.h */,
-				66755A661B3B79130013E67E /* VERSION */,
+				665957311B38B2B4003E97A1 /* AEFloatConverter.h */,
+				665957321B38B2B4003E97A1 /* AEFloatConverter.m */,
+				665957331B38B2B4003E97A1 /* EZAudio.h */,
+				665957341B38B2B4003E97A1 /* EZAudio.m */,
+				665957351B38B2B4003E97A1 /* EZAudioDevice.h */,
+				665957361B38B2B4003E97A1 /* EZAudioDevice.m */,
+				665957371B38B2B4003E97A1 /* EZAudioFile.h */,
+				665957381B38B2B4003E97A1 /* EZAudioFile.m */,
+				665957391B38B2B4003E97A1 /* EZAudioFloatConverter.h */,
+				6659573A1B38B2B4003E97A1 /* EZAudioFloatConverter.m */,
+				6659573B1B38B2B4003E97A1 /* EZAudioFloatData.h */,
+				6659573C1B38B2B4003E97A1 /* EZAudioFloatData.m */,
+				6659573D1B38B2B4003E97A1 /* EZAudioPlayer.h */,
+				6659573E1B38B2B4003E97A1 /* EZAudioPlayer.m */,
+				6659573F1B38B2B4003E97A1 /* EZAudioPlot.h */,
+				665957401B38B2B4003E97A1 /* EZAudioPlot.m */,
+				665957411B38B2B4003E97A1 /* EZAudioPlotGL.h */,
+				665957421B38B2B4003E97A1 /* EZAudioPlotGL.m */,
+				665957431B38B2B4003E97A1 /* EZAudioPlotGLKViewController.h */,
+				665957441B38B2B4003E97A1 /* EZAudioPlotGLKViewController.m */,
+				665957451B38B2B4003E97A1 /* EZAudioUtilities.h */,
+				665957461B38B2B4003E97A1 /* EZAudioUtilities.m */,
+				665957471B38B2B4003E97A1 /* EZMicrophone.h */,
+				665957481B38B2B4003E97A1 /* EZMicrophone.m */,
+				665957491B38B2B4003E97A1 /* EZOutput.h */,
+				6659574A1B38B2B4003E97A1 /* EZOutput.m */,
+				6659574B1B38B2B4003E97A1 /* EZPlot.h */,
+				6659574C1B38B2B4003E97A1 /* EZPlot.m */,
+				6659574D1B38B2B4003E97A1 /* EZRecorder.h */,
+				6659574E1B38B2B4003E97A1 /* EZRecorder.m */,
+				6659574F1B38B2B4003E97A1 /* TPCircularBuffer.c */,
+				665957501B38B2B4003E97A1 /* TPCircularBuffer.h */,
+				665957511B38B2B4003E97A1 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		66755A661B3B79130013E67E /* VERSION */ = {
+		665957511B38B2B4003E97A1 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				66755A671B3B79130013E67E /* CHANGELOG */,
-				66755A681B3B79130013E67E /* VERSION */,
+				665957521B38B2B4003E97A1 /* CHANGELOG */,
+				665957531B38B2B4003E97A1 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -241,7 +246,7 @@
 		94056D9C185BB0BC00EB94BA /* EZAudioOpenGLWaveformExample */ = {
 			isa = PBXGroup;
 			children = (
-				66755A431B3B79120013E67E /* EZAudio */,
+				665957301B38B2B4003E97A1 /* EZAudio */,
 				94056DA8185BB0BC00EB94BA /* AppDelegate.h */,
 				94056DA9185BB0BC00EB94BA /* AppDelegate.m */,
 				94056DCA185BB0D600EB94BA /* OpenGLWaveformViewController.h */,
@@ -361,12 +366,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				94056DA1185BB0BC00EB94BA /* InfoPlist.strings in Resources */,
-				66755A7B1B3B79130013E67E /* VERSION in Resources */,
+				665957651B38B2B4003E97A1 /* VERSION in Resources */,
 				94056DAF185BB0BC00EB94BA /* Images.xcassets in Resources */,
 				94056DA7185BB0BC00EB94BA /* Credits.rtf in Resources */,
 				94056DCE185BB0D600EB94BA /* OpenGLWaveformViewController.xib in Resources */,
 				94056DAD185BB0BC00EB94BA /* MainMenu.xib in Resources */,
-				66755A7A1B3B79130013E67E /* CHANGELOG in Resources */,
+				665957641B38B2B4003E97A1 /* CHANGELOG in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -385,24 +390,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				66755A711B3B79130013E67E /* EZAudioPlot.m in Sources */,
-				66755A701B3B79130013E67E /* EZAudioPlayer.m in Sources */,
+				665957621B38B2B4003E97A1 /* EZRecorder.m in Sources */,
 				94056DAA185BB0BC00EB94BA /* AppDelegate.m in Sources */,
-				66755A721B3B79130013E67E /* EZAudioPlotGL.m in Sources */,
-				66755A6D1B3B79130013E67E /* EZAudioFile.m in Sources */,
-				66755A761B3B79130013E67E /* EZOutput.m in Sources */,
-				66755A741B3B79130013E67E /* EZAudioUtilities.m in Sources */,
-				66755A771B3B79130013E67E /* EZPlot.m in Sources */,
+				665957581B38B2B4003E97A1 /* EZAudioFloatConverter.m in Sources */,
+				665957591B38B2B4003E97A1 /* EZAudioFloatData.m in Sources */,
+				665957541B38B2B4003E97A1 /* AEFloatConverter.m in Sources */,
+				665957571B38B2B4003E97A1 /* EZAudioFile.m in Sources */,
+				665957601B38B2B4003E97A1 /* EZOutput.m in Sources */,
+				6659575C1B38B2B4003E97A1 /* EZAudioPlotGL.m in Sources */,
+				665957631B38B2B4003E97A1 /* TPCircularBuffer.c in Sources */,
+				6659575B1B38B2B4003E97A1 /* EZAudioPlot.m in Sources */,
 				94056DA3185BB0BC00EB94BA /* main.m in Sources */,
-				66755A781B3B79130013E67E /* EZRecorder.m in Sources */,
-				66755A6F1B3B79130013E67E /* EZAudioFloatData.m in Sources */,
-				66755A6E1B3B79130013E67E /* EZAudioFloatConverter.m in Sources */,
-				66755A6C1B3B79130013E67E /* EZAudioDisplayLink.m in Sources */,
-				66755A751B3B79130013E67E /* EZMicrophone.m in Sources */,
-				66755A6B1B3B79130013E67E /* EZAudioDevice.m in Sources */,
+				6659575F1B38B2B4003E97A1 /* EZMicrophone.m in Sources */,
+				6659575A1B38B2B4003E97A1 /* EZAudioPlayer.m in Sources */,
+				665957561B38B2B4003E97A1 /* EZAudioDevice.m in Sources */,
 				94056DCD185BB0D600EB94BA /* OpenGLWaveformViewController.m in Sources */,
-				66755A791B3B79130013E67E /* TPCircularBuffer.c in Sources */,
-				66755A6A1B3B79130013E67E /* EZAudio.m in Sources */,
+				665957611B38B2B4003E97A1 /* EZPlot.m in Sources */,
+				665957551B38B2B4003E97A1 /* EZAudio.m in Sources */,
+				6659575E1B38B2B4003E97A1 /* EZAudioUtilities.m in Sources */,
+				6659575D1B38B2B4003E97A1 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

EZAudioExamples/OSX/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/Base.lproj/MainMenu.xib

@@ -1,17 +1,100 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4439" systemVersion="13A451" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4439"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
             <connections>
+                <action selector="orderFrontStandardAboutPanel:" destination="58" id="142"/>
                 <outlet property="delegate" destination="494" id="495"/>
             </connections>
         </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder">
+            <connections>
+                <action selector="alignCenter:" destination="499" id="518"/>
+                <action selector="alignJustified:" destination="500" id="523"/>
+                <action selector="alignLeft:" destination="498" id="524"/>
+                <action selector="alignRight:" destination="501" id="521"/>
+                <action selector="arrangeInFront:" destination="5" id="39"/>
+                <action selector="capitalizeWord:" destination="466" id="467"/>
+                <action selector="centerSelectionInVisibleArea:" destination="210" id="245"/>
+                <action selector="checkSpelling:" destination="201" id="225"/>
+                <action selector="clearRecentDocuments:" destination="126" id="127"/>
+                <action selector="copy:" destination="197" id="224"/>
+                <action selector="copyFont:" destination="403" id="428"/>
+                <action selector="copyRuler:" destination="506" id="522"/>
+                <action selector="cut:" destination="199" id="228"/>
+                <action selector="delete:" destination="202" id="235"/>
+                <action selector="hide:" destination="134" id="367"/>
+                <action selector="hideOtherApplications:" destination="145" id="368"/>
+                <action selector="loosenKerning:" destination="419" id="435"/>
+                <action selector="lowerBaseline:" destination="410" id="427"/>
+                <action selector="lowercaseWord:" destination="465" id="468"/>
+                <action selector="makeBaseWritingDirectionLeftToRight:" destination="511" id="526"/>
+                <action selector="makeBaseWritingDirectionNatural:" destination="510" id="525"/>
+                <action selector="makeBaseWritingDirectionRightToLeft:" destination="512" id="527"/>
+                <action selector="makeTextWritingDirectionLeftToRight:" destination="516" id="529"/>
+                <action selector="makeTextWritingDirectionNatural:" destination="515" id="528"/>
+                <action selector="makeTextWritingDirectionRightToLeft:" destination="517" id="530"/>
+                <action selector="newDocument:" destination="82" id="373"/>
+                <action selector="openDocument:" destination="72" id="374"/>
+                <action selector="orderFrontColorPanel:" destination="401" id="433"/>
+                <action selector="orderFrontSubstitutionsPanel:" destination="457" id="458"/>
+                <action selector="paste:" destination="203" id="226"/>
+                <action selector="pasteAsPlainText:" destination="485" id="486"/>
+                <action selector="pasteFont:" destination="404" id="436"/>
+                <action selector="pasteRuler:" destination="507" id="519"/>
+                <action selector="performClose:" destination="73" id="193"/>
+                <action selector="performFindPanelAction:" destination="209" id="241"/>
+                <action selector="performFindPanelAction:" destination="208" id="487"/>
+                <action selector="performFindPanelAction:" destination="213" id="488"/>
+                <action selector="performFindPanelAction:" destination="221" id="489"/>
+                <action selector="performFindPanelAction:" destination="534" id="535"/>
+                <action selector="performMiniaturize:" destination="23" id="37"/>
+                <action selector="performZoom:" destination="239" id="240"/>
+                <action selector="print:" destination="78" id="86"/>
+                <action selector="raiseBaseline:" destination="409" id="426"/>
+                <action selector="redo:" destination="215" id="231"/>
+                <action selector="revertDocumentToSaved:" destination="112" id="364"/>
+                <action selector="runPageLayout:" destination="77" id="87"/>
+                <action selector="runToolbarCustomizationPalette:" destination="298" id="365"/>
+                <action selector="saveDocument:" destination="75" id="362"/>
+                <action selector="selectAll:" destination="198" id="232"/>
+                <action selector="showGuessPanel:" destination="204" id="230"/>
+                <action selector="showHelp:" destination="492" id="493"/>
+                <action selector="startSpeaking:" destination="196" id="233"/>
+                <action selector="stopSpeaking:" destination="195" id="227"/>
+                <action selector="subscript:" destination="408" id="429"/>
+                <action selector="superscript:" destination="407" id="430"/>
+                <action selector="tightenKerning:" destination="418" id="431"/>
+                <action selector="toggleAutomaticDashSubstitution:" destination="460" id="461"/>
+                <action selector="toggleAutomaticLinkDetection:" destination="354" id="357"/>
+                <action selector="toggleAutomaticQuoteSubstitution:" destination="351" id="356"/>
+                <action selector="toggleAutomaticSpellingCorrection:" destination="454" id="456"/>
+                <action selector="toggleAutomaticTextReplacement:" destination="462" id="463"/>
+                <action selector="toggleContinuousSpellChecking:" destination="219" id="222"/>
+                <action selector="toggleGrammarChecking:" destination="346" id="347"/>
+                <action selector="toggleRuler:" destination="505" id="520"/>
+                <action selector="toggleSmartInsertDelete:" destination="350" id="355"/>
+                <action selector="toggleToolbarShown:" destination="297" id="366"/>
+                <action selector="turnOffKerning:" destination="417" id="441"/>
+                <action selector="turnOffLigatures:" destination="413" id="440"/>
+                <action selector="underline:" destination="392" id="432"/>
+                <action selector="undo:" destination="207" id="223"/>
+                <action selector="unhideAllApplications:" destination="150" id="370"/>
+                <action selector="unscript:" destination="406" id="437"/>
+                <action selector="uppercaseWord:" destination="452" id="464"/>
+                <action selector="useAllLigatures:" destination="414" id="434"/>
+                <action selector="useStandardKerning:" destination="416" id="438"/>
+                <action selector="useStandardLigatures:" destination="412" id="439"/>
+            </connections>
+        </customObject>
+        <customObject id="-3" userLabel="Application">
+            <connections>
+                <action selector="terminate:" destination="136" id="449"/>
+            </connections>
+        </customObject>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
                 <menuItem title="EZAudioOpenGLWaveformExample" id="56">
@@ -19,9 +102,6 @@
                         <items>
                             <menuItem title="About EZAudioOpenGLWaveformExample" id="58">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="236">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
@@ -36,211 +116,95 @@
                             <menuItem isSeparatorItem="YES" id="144">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Hide EZAudioOpenGLWaveformExample" keyEquivalent="h" id="134">
-                                <connections>
-                                    <action selector="hide:" target="-1" id="367"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Hide EZAudioOpenGLWaveformExample" keyEquivalent="h" id="134"/>
                             <menuItem title="Hide Others" keyEquivalent="h" id="145">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Show All" id="150">
-                                <connections>
-                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Show All" id="150"/>
                             <menuItem isSeparatorItem="YES" id="149">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Quit EZAudioOpenGLWaveformExample" keyEquivalent="q" id="136">
-                                <connections>
-                                    <action selector="terminate:" target="-3" id="449"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Quit EZAudioOpenGLWaveformExample" keyEquivalent="q" id="136"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="File" id="83">
                     <menu key="submenu" title="File" id="81">
                         <items>
-                            <menuItem title="New" keyEquivalent="n" id="82">
-                                <connections>
-                                    <action selector="newDocument:" target="-1" id="373"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Open…" keyEquivalent="o" id="72">
-                                <connections>
-                                    <action selector="openDocument:" target="-1" id="374"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="New" keyEquivalent="n" id="82"/>
+                            <menuItem title="Open…" keyEquivalent="o" id="72"/>
                             <menuItem title="Open Recent" id="124">
                                 <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
                                     <items>
-                                        <menuItem title="Clear Menu" id="126">
-                                            <connections>
-                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Clear Menu" id="126"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="79">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Close" keyEquivalent="w" id="73">
-                                <connections>
-                                    <action selector="performClose:" target="-1" id="193"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Save…" keyEquivalent="s" id="75">
-                                <connections>
-                                    <action selector="saveDocument:" target="-1" id="362"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73"/>
+                            <menuItem title="Save…" keyEquivalent="s" id="75"/>
                             <menuItem title="Revert to Saved" id="112">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="revertDocumentToSaved:" target="-1" id="364"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="74">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Page Setup..." keyEquivalent="P" id="77">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="runPageLayout:" target="-1" id="87"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Print…" keyEquivalent="p" id="78">
-                                <connections>
-                                    <action selector="print:" target="-1" id="86"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="78"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Edit" id="217">
                     <menu key="submenu" title="Edit" id="205">
                         <items>
-                            <menuItem title="Undo" keyEquivalent="z" id="207">
-                                <connections>
-                                    <action selector="undo:" target="-1" id="223"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Undo" keyEquivalent="z" id="207"/>
                             <menuItem title="Redo" keyEquivalent="Z" id="215">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="redo:" target="-1" id="231"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="206">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Cut" keyEquivalent="x" id="199">
-                                <connections>
-                                    <action selector="cut:" target="-1" id="228"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Copy" keyEquivalent="c" id="197">
-                                <connections>
-                                    <action selector="copy:" target="-1" id="224"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste" keyEquivalent="v" id="203">
-                                <connections>
-                                    <action selector="paste:" target="-1" id="226"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="199"/>
+                            <menuItem title="Copy" keyEquivalent="c" id="197"/>
+                            <menuItem title="Paste" keyEquivalent="v" id="203"/>
                             <menuItem title="Paste and Match Style" keyEquivalent="V" id="485">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="pasteAsPlainText:" target="-1" id="486"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Delete" id="202">
-                                <connections>
-                                    <action selector="delete:" target="-1" id="235"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="198">
-                                <connections>
-                                    <action selector="selectAll:" target="-1" id="232"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Delete" id="202"/>
+                            <menuItem title="Select All" keyEquivalent="a" id="198"/>
                             <menuItem isSeparatorItem="YES" id="214">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Find" id="218">
                                 <menu key="submenu" title="Find" id="220">
                                     <items>
-                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="241"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209"/>
                                         <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="534">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="535"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="487"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208"/>
                                         <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="213">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="488"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="489"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210">
-                                            <connections>
-                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221"/>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem title="Spelling and Grammar" id="216">
                                 <menu key="submenu" title="Spelling and Grammar" id="200">
                                     <items>
-                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204">
-                                            <connections>
-                                                <action selector="showGuessPanel:" target="-1" id="230"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201">
-                                            <connections>
-                                                <action selector="checkSpelling:" target="-1" id="225"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204"/>
+                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201"/>
                                         <menuItem isSeparatorItem="YES" id="453"/>
-                                        <menuItem title="Check Spelling While Typing" id="219">
-                                            <connections>
-                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="222"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Grammar With Spelling" id="346">
-                                            <connections>
-                                                <action selector="toggleGrammarChecking:" target="-1" id="347"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Check Spelling While Typing" id="219"/>
+                                        <menuItem title="Check Grammar With Spelling" id="346"/>
                                         <menuItem title="Correct Spelling Automatically" id="454">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="456"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -250,38 +214,18 @@
                                     <items>
                                         <menuItem title="Show Substitutions" id="457">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="458"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="459"/>
-                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350">
-                                            <connections>
-                                                <action selector="toggleSmartInsertDelete:" target="-1" id="355"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351">
-                                            <connections>
-                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="356"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350"/>
+                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351"/>
                                         <menuItem title="Smart Dashes" id="460">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="461"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Smart Links" tag="3" keyEquivalent="G" id="354">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="357"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Text Replacement" id="462">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="463"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -292,21 +236,12 @@
                                     <items>
                                         <menuItem title="Make Upper Case" id="452">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="uppercaseWord:" target="-1" id="464"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Make Lower Case" id="465">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="lowercaseWord:" target="-1" id="468"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Capitalize" id="466">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="capitalizeWord:" target="-1" id="467"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -314,16 +249,8 @@
                             <menuItem title="Speech" id="211">
                                 <menu key="submenu" title="Speech" id="212">
                                     <items>
-                                        <menuItem title="Start Speaking" id="196">
-                                            <connections>
-                                                <action selector="startSpeaking:" target="-1" id="233"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Stop Speaking" id="195">
-                                            <connections>
-                                                <action selector="stopSpeaking:" target="-1" id="227"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Start Speaking" id="196"/>
+                                        <menuItem title="Stop Speaking" id="195"/>
                                     </items>
                                 </menu>
                             </menuItem>
@@ -338,37 +265,13 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Font" systemMenu="font" id="388">
                                     <items>
-                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389">
-                                            <connections>
-                                                <action selector="orderFrontFontPanel:" target="420" id="424"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="421"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="422"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Underline" keyEquivalent="u" id="392">
-                                            <connections>
-                                                <action selector="underline:" target="-1" id="432"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389"/>
+                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390"/>
+                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391"/>
+                                        <menuItem title="Underline" keyEquivalent="u" id="392"/>
                                         <menuItem isSeparatorItem="YES" id="393"/>
-                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="425"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="423"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394"/>
+                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395"/>
                                         <menuItem isSeparatorItem="YES" id="396"/>
                                         <menuItem title="Kern" id="397">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -376,27 +279,15 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="416">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardKerning:" target="-1" id="438"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="417">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffKerning:" target="-1" id="441"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Tighten" id="418">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="tightenKerning:" target="-1" id="431"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Loosen" id="419">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="loosenKerning:" target="-1" id="435"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -407,21 +298,12 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="412">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardLigatures:" target="-1" id="439"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="413">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffLigatures:" target="-1" id="440"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use All" id="414">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useAllLigatures:" target="-1" id="434"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -432,55 +314,30 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="406">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="unscript:" target="-1" id="437"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Superscript" id="407">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="superscript:" target="-1" id="430"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Subscript" id="408">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="subscript:" target="-1" id="429"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Raise" id="409">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="raiseBaseline:" target="-1" id="426"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Lower" id="410">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="lowerBaseline:" target="-1" id="427"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="400"/>
-                                        <menuItem title="Show Colors" keyEquivalent="C" id="401">
-                                            <connections>
-                                                <action selector="orderFrontColorPanel:" target="-1" id="433"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Colors" keyEquivalent="C" id="401"/>
                                         <menuItem isSeparatorItem="YES" id="402"/>
                                         <menuItem title="Copy Style" keyEquivalent="c" id="403">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyFont:" target="-1" id="428"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Style" keyEquivalent="v" id="404">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteFont:" target="-1" id="436"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -489,27 +346,12 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Text" id="497">
                                     <items>
-                                        <menuItem title="Align Left" keyEquivalent="{" id="498">
-                                            <connections>
-                                                <action selector="alignLeft:" target="-1" id="524"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Center" keyEquivalent="|" id="499">
-                                            <connections>
-                                                <action selector="alignCenter:" target="-1" id="518"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Align Left" keyEquivalent="{" id="498"/>
+                                        <menuItem title="Center" keyEquivalent="|" id="499"/>
                                         <menuItem title="Justify" id="500">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="alignJustified:" target="-1" id="523"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Align Right" keyEquivalent="}" id="501">
-                                            <connections>
-                                                <action selector="alignRight:" target="-1" id="521"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Align Right" keyEquivalent="}" id="501"/>
                                         <menuItem isSeparatorItem="YES" id="502"/>
                                         <menuItem title="Writing Direction" id="503">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -521,23 +363,14 @@
                                                     <menuItem id="510">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionNatural:" target="-1" id="525"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="511">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="526"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="512">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="527"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem isSeparatorItem="YES" id="513"/>
                                                     <menuItem title="Selection" enabled="NO" id="514">
@@ -546,23 +379,14 @@
                                                     <menuItem id="515">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionNatural:" target="-1" id="528"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="516">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="529"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="517">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="530"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -570,21 +394,12 @@
                                         <menuItem isSeparatorItem="YES" id="504"/>
                                         <menuItem title="Show Ruler" id="505">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleRuler:" target="-1" id="520"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Copy Ruler" keyEquivalent="c" id="506">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyRuler:" target="-1" id="522"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Ruler" keyEquivalent="v" id="507">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteRuler:" target="-1" id="519"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -597,39 +412,20 @@
                         <items>
                             <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleToolbarShown:" target="-1" id="366"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Customize Toolbar…" id="298">
-                                <connections>
-                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="365"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Customize Toolbar…" id="298"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Window" id="19">
                     <menu key="submenu" title="Window" systemMenu="window" id="24">
                         <items>
-                            <menuItem title="Minimize" keyEquivalent="m" id="23">
-                                <connections>
-                                    <action selector="performMiniaturize:" target="-1" id="37"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Zoom" id="239">
-                                <connections>
-                                    <action selector="performZoom:" target="-1" id="240"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23"/>
+                            <menuItem title="Zoom" id="239"/>
                             <menuItem isSeparatorItem="YES" id="92">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Bring All to Front" id="5">
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="39"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5"/>
                         </items>
                     </menu>
                 </menuItem>
@@ -637,22 +433,17 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="491">
                         <items>
-                            <menuItem title="EZAudioOpenGLWaveformExample Help" keyEquivalent="?" id="492">
-                                <connections>
-                                    <action selector="showHelp:" target="-1" id="493"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="EZAudioOpenGLWaveformExample Help" keyEquivalent="?" id="492"/>
                         </items>
                     </menu>
                 </menuItem>
             </items>
         </menu>
         <window title="EZAudioOpenGLWaveformExample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
-            <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <view key="contentView" id="372">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -663,6 +454,14 @@
                 <outlet property="window" destination="371" id="532"/>
             </connections>
         </customObject>
-        <customObject id="420" customClass="NSFontManager"/>
+        <customObject id="420" customClass="NSFontManager">
+            <connections>
+                <action selector="addFontTrait:" destination="390" id="421"/>
+                <action selector="addFontTrait:" destination="391" id="422"/>
+                <action selector="modifyFont:" destination="395" id="423"/>
+                <action selector="modifyFont:" destination="394" id="425"/>
+                <action selector="orderFrontFontPanel:" destination="389" id="424"/>
+            </connections>
+        </customObject>
     </objects>
 </document>

EZAudioExamples/OSX/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/OpenGLWaveformViewController.h

@@ -61,11 +61,6 @@
  */
 @property (nonatomic, weak) IBOutlet NSPopUpButton *microphoneInputChannelPopUpButton;
 
-/**
- The checkbox button used to turn the microphone off/on
- */
-@property (nonatomic, weak) IBOutlet NSButton *microphoneSwitch;
-
 //------------------------------------------------------------------------------
 #pragma mark - Actions
 //------------------------------------------------------------------------------

EZAudioExamples/OSX/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/OpenGLWaveformViewController.m

@@ -106,8 +106,10 @@
     for (int i = 0; i < self.microphone.device.inputChannelCount; i++)
     {
         NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@(i).stringValue
-                                                      action:nil
+                                                      action:@selector(changedInputChannel:)
                                                keyEquivalent:@""];
+        item.representedObject = @(i);
+        item.target = self;
         [menu addItem:item];
     }
     self.microphoneInputChannelPopUpButton.menu = menu;
@@ -226,7 +228,8 @@ withNumberOfChannels:(UInt32)numberOfChannels
 
 //------------------------------------------------------------------------------
 
-- (void)microphone:(EZMicrophone *)microphone changedDevice:(EZAudioDevice *)device
+- (void)microphone:(EZMicrophone *)microphone
+     changedDevice:(EZAudioDevice *)device
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         //
@@ -245,25 +248,4 @@ withNumberOfChannels:(UInt32)numberOfChannels
 
 //------------------------------------------------------------------------------
 
-- (void)microphone:(EZMicrophone *)microphone changedPlayingState:(BOOL)isPlaying
-{
-    NSString *title = isPlaying ? @"Microphone On" : @"Microphone Off";
-    [self setTitle:title forButton:self.microphoneSwitch];
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Utility
-//------------------------------------------------------------------------------
-
-- (void)setTitle:(NSString *)title forButton:(NSButton *)button
-{
-    NSDictionary *attributes = @{ NSForegroundColorAttributeName : [NSColor whiteColor] };
-    NSAttributedString *attributedTitle = [[NSAttributedString alloc] initWithString:title
-                                                                          attributes:attributes];
-    button.attributedTitle = attributedTitle;
-    button.attributedAlternateTitle = attributedTitle;
-}
-
-//------------------------------------------------------------------------------
-
 @end

EZAudioExamples/OSX/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/OpenGLWaveformViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="OpenGLWaveformViewController">
@@ -10,7 +10,6 @@
                 <outlet property="audioPlot" destination="foT-nv-032" id="Baw-Le-z98"/>
                 <outlet property="microphoneInputChannelPopUpButton" destination="Usd-lp-n8s" id="FbQ-hj-24k"/>
                 <outlet property="microphoneInputPopUpButton" destination="wBG-jf-wVy" id="thS-Ur-IMj"/>
-                <outlet property="microphoneSwitch" destination="TbW-ha-PgJ" id="wEZ-dt-f7t"/>
                 <outlet property="view" destination="hFn-jA-9Se" id="cfu-I4-qhQ"/>
             </connections>
         </customObject>
@@ -20,107 +19,104 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="foT-nv-032" customClass="EZAudioPlotGL">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
-                    <subviews>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="TbW-ha-PgJ">
-                            <rect key="frame" x="339" y="47" width="123" height="18"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="119" id="xPL-Un-c5O"/>
-                            </constraints>
-                            <buttonCell key="cell" type="check" title="Microphone On" bezelStyle="regularSquare" imagePosition="right" state="on" inset="2" id="DaM-FV-gba">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="toggleMicrophone:" target="-2" id="Zb5-tE-lf2"/>
-                            </connections>
-                        </button>
-                        <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UPI-59-15v">
-                            <rect key="frame" x="335" y="18" width="127" height="24"/>
-                            <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="VRd-fb-9nH">
-                                <font key="font" metaFont="system"/>
-                                <segments>
-                                    <segment label="Buffer" selected="YES"/>
-                                    <segment label="Rolling" tag="1"/>
-                                </segments>
-                            </segmentedCell>
-                            <connections>
-                                <action selector="changePlotType:" target="-2" id="BMJ-vA-3ce"/>
-                            </connections>
-                        </segmentedControl>
-                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wBG-jf-wVy" userLabel="microphoneInputPopUpButton">
-                            <rect key="frame" x="18" y="17" width="180" height="26"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="175" id="aMw-9p-rHt"/>
-                            </constraints>
-                            <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="cAL-rs-h1w" id="H5k-ea-wV5">
-                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="menu"/>
-                                <menu key="menu" id="15c-sS-jR2">
-                                    <items>
-                                        <menuItem title="Item 1" state="on" id="cAL-rs-h1w"/>
-                                        <menuItem title="Item 2" id="LTz-i3-N0M"/>
-                                        <menuItem title="Item 3" id="twD-3N-rcl"/>
-                                    </items>
-                                </menu>
-                            </popUpButtonCell>
-                        </popUpButton>
-                        <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Usd-lp-n8s" userLabel="microphoneInputChannelPopUpButton">
-                            <rect key="frame" x="204" y="17" width="79" height="26"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="74" id="oDB-ke-aGz"/>
-                            </constraints>
-                            <popUpButtonCell key="cell" type="push" title="1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Oit-zz-O9w" id="Eyb-QQ-0bg">
-                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="menu"/>
-                                <menu key="menu" id="IPB-NH-My1">
-                                    <items>
-                                        <menuItem title="1" state="on" id="Oit-zz-O9w"/>
-                                        <menuItem title="Item 2" id="v3y-Nn-80j"/>
-                                        <menuItem title="Item 3" id="IHk-VR-fPC"/>
-                                    </items>
-                                </menu>
-                            </popUpButtonCell>
-                        </popUpButton>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AuX-d2-dD9">
-                            <rect key="frame" x="18" y="46" width="36" height="17"/>
-                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Input" id="Fq3-tX-8aU">
-                                <font key="font" metaFont="system"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PMV-Zt-Wg6">
-                            <rect key="frame" x="204" y="46" width="55" height="17"/>
-                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Channel" id="PTE-g2-mTV">
-                                <font key="font" metaFont="system"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                    </subviews>
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="TbW-ha-PgJ">
+                    <rect key="frame" x="339" y="44" width="123" height="18"/>
                     <constraints>
-                        <constraint firstItem="AuX-d2-dD9" firstAttribute="leading" secondItem="foT-nv-032" secondAttribute="leading" constant="20" id="251-JP-6Sa"/>
-                        <constraint firstItem="PMV-Zt-Wg6" firstAttribute="leading" secondItem="AuX-d2-dD9" secondAttribute="trailing" constant="154" id="2EP-1U-pH4"/>
-                        <constraint firstAttribute="bottom" secondItem="wBG-jf-wVy" secondAttribute="bottom" constant="20" id="3kE-rV-Xyk"/>
-                        <constraint firstItem="wBG-jf-wVy" firstAttribute="leading" secondItem="foT-nv-032" secondAttribute="leading" constant="20" id="5BJ-zk-KIK"/>
-                        <constraint firstItem="wBG-jf-wVy" firstAttribute="top" secondItem="AuX-d2-dD9" secondAttribute="bottom" constant="5" id="GPm-pn-f3f"/>
-                        <constraint firstAttribute="bottom" secondItem="UPI-59-15v" secondAttribute="bottom" constant="20" id="NIO-kU-qxG"/>
-                        <constraint firstItem="UPI-59-15v" firstAttribute="top" secondItem="TbW-ha-PgJ" secondAttribute="bottom" constant="8" id="TZN-2g-Vnf"/>
-                        <constraint firstAttribute="trailing" secondItem="TbW-ha-PgJ" secondAttribute="trailing" constant="20" id="mg0-av-TaM"/>
-                        <constraint firstItem="Usd-lp-n8s" firstAttribute="top" secondItem="PMV-Zt-Wg6" secondAttribute="bottom" constant="5" id="nD0-WN-DIk"/>
-                        <constraint firstAttribute="trailing" secondItem="UPI-59-15v" secondAttribute="trailing" constant="20" id="rW1-1W-2K8"/>
-                        <constraint firstItem="Usd-lp-n8s" firstAttribute="leading" secondItem="wBG-jf-wVy" secondAttribute="trailing" constant="11" id="uWS-Ht-6JY"/>
-                        <constraint firstAttribute="bottom" secondItem="Usd-lp-n8s" secondAttribute="bottom" constant="20" id="yZL-HJ-0px"/>
+                        <constraint firstAttribute="width" constant="119" id="xPL-Un-c5O"/>
                     </constraints>
+                    <buttonCell key="cell" type="check" title="Microphone On" bezelStyle="regularSquare" imagePosition="right" state="on" inset="2" id="DaM-FV-gba">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="toggleMicrophone:" target="-2" id="Zb5-tE-lf2"/>
+                    </connections>
+                </button>
+                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UPI-59-15v">
+                    <rect key="frame" x="335" y="15" width="127" height="24"/>
+                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="VRd-fb-9nH">
+                        <font key="font" metaFont="system"/>
+                        <segments>
+                            <segment label="Buffer" selected="YES"/>
+                            <segment label="Rolling" tag="1"/>
+                        </segments>
+                    </segmentedCell>
+                    <connections>
+                        <action selector="changePlotType:" target="-2" id="BMJ-vA-3ce"/>
+                    </connections>
+                </segmentedControl>
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wBG-jf-wVy" userLabel="microphoneInputPopUpButton">
+                    <rect key="frame" x="18" y="14" width="180" height="26"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="175" id="aMw-9p-rHt"/>
+                    </constraints>
+                    <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="cAL-rs-h1w" id="H5k-ea-wV5">
+                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="menu"/>
+                        <menu key="menu" id="15c-sS-jR2">
+                            <items>
+                                <menuItem title="Item 1" state="on" id="cAL-rs-h1w"/>
+                                <menuItem title="Item 2" id="LTz-i3-N0M"/>
+                                <menuItem title="Item 3" id="twD-3N-rcl"/>
+                            </items>
+                        </menu>
+                    </popUpButtonCell>
+                </popUpButton>
+                <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Usd-lp-n8s" userLabel="microphoneInputChannelPopUpButton">
+                    <rect key="frame" x="204" y="14" width="79" height="26"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="74" id="oDB-ke-aGz"/>
+                    </constraints>
+                    <popUpButtonCell key="cell" type="push" title="1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Oit-zz-O9w" id="Eyb-QQ-0bg">
+                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="menu"/>
+                        <menu key="menu" id="IPB-NH-My1">
+                            <items>
+                                <menuItem title="1" state="on" id="Oit-zz-O9w"/>
+                                <menuItem title="Item 2" id="v3y-Nn-80j"/>
+                                <menuItem title="Item 3" id="IHk-VR-fPC"/>
+                            </items>
+                        </menu>
+                    </popUpButtonCell>
+                </popUpButton>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AuX-d2-dD9">
+                    <rect key="frame" x="18" y="43" width="31" height="14"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Input" id="Fq3-tX-8aU">
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PMV-Zt-Wg6">
+                    <rect key="frame" x="204" y="43" width="48" height="14"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Channel" id="PTE-g2-mTV">
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="foT-nv-032" customClass="EZAudioPlotGL">
+                    <rect key="frame" x="0.0" y="77" width="480" height="195"/>
                 </customView>
             </subviews>
             <constraints>
+                <constraint firstAttribute="bottom" secondItem="wBG-jf-wVy" secondAttribute="bottom" constant="17" id="39Q-dq-Ifx"/>
                 <constraint firstAttribute="trailing" secondItem="foT-nv-032" secondAttribute="trailing" id="4QC-HO-oMa"/>
                 <constraint firstItem="foT-nv-032" firstAttribute="top" secondItem="hFn-jA-9Se" secondAttribute="top" id="5zo-Yc-OKX"/>
-                <constraint firstAttribute="bottom" secondItem="foT-nv-032" secondAttribute="bottom" id="VKs-UL-eU4"/>
+                <constraint firstItem="UPI-59-15v" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Usd-lp-n8s" secondAttribute="trailing" constant="11" id="AXw-KY-VEi"/>
+                <constraint firstItem="Usd-lp-n8s" firstAttribute="top" secondItem="PMV-Zt-Wg6" secondAttribute="bottom" constant="5" id="GZn-x5-gDa"/>
+                <constraint firstAttribute="trailing" secondItem="UPI-59-15v" secondAttribute="trailing" constant="20" id="Ihi-YB-8cN"/>
+                <constraint firstItem="AuX-d2-dD9" firstAttribute="leading" secondItem="hFn-jA-9Se" secondAttribute="leading" constant="20" id="RFU-gK-hRd"/>
+                <constraint firstItem="TbW-ha-PgJ" firstAttribute="top" secondItem="foT-nv-032" secondAttribute="bottom" constant="17" id="aWO-qE-S52"/>
+                <constraint firstAttribute="bottom" secondItem="UPI-59-15v" secondAttribute="bottom" constant="17" id="biy-0r-WsW"/>
+                <constraint firstItem="wBG-jf-wVy" firstAttribute="top" secondItem="AuX-d2-dD9" secondAttribute="bottom" constant="5" id="fEE-bx-NVl"/>
+                <constraint firstItem="UPI-59-15v" firstAttribute="top" secondItem="TbW-ha-PgJ" secondAttribute="bottom" constant="8" id="gMX-Q1-9Ly"/>
+                <constraint firstAttribute="trailing" secondItem="TbW-ha-PgJ" secondAttribute="trailing" constant="20" id="gek-Wl-IPz"/>
+                <constraint firstItem="Usd-lp-n8s" firstAttribute="leading" secondItem="wBG-jf-wVy" secondAttribute="trailing" constant="11" id="gqi-4E-1Wf"/>
+                <constraint firstItem="Usd-lp-n8s" firstAttribute="leading" secondItem="PMV-Zt-Wg6" secondAttribute="leading" id="lT3-RX-en8"/>
                 <constraint firstItem="foT-nv-032" firstAttribute="leading" secondItem="hFn-jA-9Se" secondAttribute="leading" id="o4A-j4-xiR"/>
+                <constraint firstItem="wBG-jf-wVy" firstAttribute="leading" secondItem="hFn-jA-9Se" secondAttribute="leading" constant="20" id="uyC-v9-bP1"/>
+                <constraint firstAttribute="bottom" secondItem="Usd-lp-n8s" secondAttribute="bottom" constant="17" id="yk6-Fm-gXu"/>
             </constraints>
         </customView>
     </objects>

EZAudioExamples/OSX/EZAudioPassThroughExample/EZAudioPassThroughExample.xcodeproj/project.pbxproj

@@ -7,23 +7,24 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		66755B4E1B3B79310013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B2B1B3B79310013E67E /* EZAudio.m */; };
-		66755B4F1B3B79310013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B2D1B3B79310013E67E /* EZAudioDevice.m */; };
-		66755B501B3B79310013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B2F1B3B79310013E67E /* EZAudioDisplayLink.m */; };
-		66755B511B3B79310013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B311B3B79310013E67E /* EZAudioFile.m */; };
-		66755B521B3B79310013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B331B3B79310013E67E /* EZAudioFloatConverter.m */; };
-		66755B531B3B79310013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B351B3B79310013E67E /* EZAudioFloatData.m */; };
-		66755B541B3B79310013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B371B3B79310013E67E /* EZAudioPlayer.m */; };
-		66755B551B3B79310013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B391B3B79310013E67E /* EZAudioPlot.m */; };
-		66755B561B3B79310013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B3B1B3B79310013E67E /* EZAudioPlotGL.m */; };
-		66755B581B3B79310013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B3F1B3B79310013E67E /* EZAudioUtilities.m */; };
-		66755B591B3B79310013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B411B3B79310013E67E /* EZMicrophone.m */; };
-		66755B5A1B3B79310013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B431B3B79310013E67E /* EZOutput.m */; };
-		66755B5B1B3B79310013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B451B3B79310013E67E /* EZPlot.m */; };
-		66755B5C1B3B79310013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B471B3B79310013E67E /* EZRecorder.m */; };
-		66755B5D1B3B79310013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 66755B481B3B79310013E67E /* TPCircularBuffer.c */; };
-		66755B5E1B3B79310013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 66755B4B1B3B79310013E67E /* CHANGELOG */; };
-		66755B5F1B3B79310013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 66755B4C1B3B79310013E67E /* VERSION */; };
+		6628E2901B3A1CCA00020E56 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E26E1B3A1CCA00020E56 /* AEFloatConverter.m */; };
+		6628E2911B3A1CCA00020E56 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2701B3A1CCA00020E56 /* EZAudio.m */; };
+		6628E2921B3A1CCA00020E56 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2721B3A1CCA00020E56 /* EZAudioDevice.m */; };
+		6628E2931B3A1CCA00020E56 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2741B3A1CCA00020E56 /* EZAudioFile.m */; };
+		6628E2941B3A1CCA00020E56 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2761B3A1CCA00020E56 /* EZAudioFloatConverter.m */; };
+		6628E2951B3A1CCA00020E56 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2781B3A1CCA00020E56 /* EZAudioFloatData.m */; };
+		6628E2961B3A1CCA00020E56 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E27A1B3A1CCA00020E56 /* EZAudioPlayer.m */; };
+		6628E2971B3A1CCA00020E56 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E27C1B3A1CCA00020E56 /* EZAudioPlot.m */; };
+		6628E2981B3A1CCA00020E56 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E27E1B3A1CCA00020E56 /* EZAudioPlotGL.m */; };
+		6628E2991B3A1CCA00020E56 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2801B3A1CCA00020E56 /* EZAudioPlotGLKViewController.m */; };
+		6628E29A1B3A1CCA00020E56 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2821B3A1CCA00020E56 /* EZAudioUtilities.m */; };
+		6628E29B1B3A1CCA00020E56 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2841B3A1CCA00020E56 /* EZMicrophone.m */; };
+		6628E29C1B3A1CCA00020E56 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2861B3A1CCA00020E56 /* EZOutput.m */; };
+		6628E29D1B3A1CCA00020E56 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2881B3A1CCA00020E56 /* EZPlot.m */; };
+		6628E29E1B3A1CCA00020E56 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E28A1B3A1CCA00020E56 /* EZRecorder.m */; };
+		6628E29F1B3A1CCA00020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E28B1B3A1CCA00020E56 /* TPCircularBuffer.c */; };
+		6628E2A01B3A1CCA00020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E28E1B3A1CCA00020E56 /* CHANGELOG */; };
+		6628E2A11B3A1CCA00020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E28F1B3A1CCA00020E56 /* VERSION */; };
 		941D71B81864C457007D52D8 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 941D71B71864C457007D52D8 /* Cocoa.framework */; };
 		941D71C21864C457007D52D8 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 941D71C01864C457007D52D8 /* InfoPlist.strings */; };
 		941D71C41864C457007D52D8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 941D71C31864C457007D52D8 /* main.m */; };
@@ -56,38 +57,40 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		66755B2A1B3B79310013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		66755B2B1B3B79310013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		66755B2C1B3B79310013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		66755B2D1B3B79310013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		66755B2E1B3B79310013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		66755B2F1B3B79310013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		66755B301B3B79310013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		66755B311B3B79310013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		66755B321B3B79310013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		66755B331B3B79310013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		66755B341B3B79310013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		66755B351B3B79310013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		66755B361B3B79310013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		66755B371B3B79310013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		66755B381B3B79310013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		66755B391B3B79310013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		66755B3A1B3B79310013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		66755B3B1B3B79310013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		66755B3E1B3B79310013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		66755B3F1B3B79310013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		66755B401B3B79310013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		66755B411B3B79310013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		66755B421B3B79310013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		66755B431B3B79310013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		66755B441B3B79310013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		66755B451B3B79310013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		66755B461B3B79310013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		66755B471B3B79310013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		66755B481B3B79310013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		66755B491B3B79310013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		66755B4B1B3B79310013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		66755B4C1B3B79310013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E26D1B3A1CCA00020E56 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		6628E26E1B3A1CCA00020E56 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		6628E26F1B3A1CCA00020E56 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		6628E2701B3A1CCA00020E56 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		6628E2711B3A1CCA00020E56 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		6628E2721B3A1CCA00020E56 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		6628E2731B3A1CCA00020E56 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		6628E2741B3A1CCA00020E56 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		6628E2751B3A1CCA00020E56 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		6628E2761B3A1CCA00020E56 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		6628E2771B3A1CCA00020E56 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		6628E2781B3A1CCA00020E56 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		6628E2791B3A1CCA00020E56 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		6628E27A1B3A1CCA00020E56 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		6628E27B1B3A1CCA00020E56 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		6628E27C1B3A1CCA00020E56 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		6628E27D1B3A1CCA00020E56 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		6628E27E1B3A1CCA00020E56 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		6628E27F1B3A1CCA00020E56 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		6628E2801B3A1CCA00020E56 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		6628E2811B3A1CCA00020E56 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		6628E2821B3A1CCA00020E56 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		6628E2831B3A1CCA00020E56 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		6628E2841B3A1CCA00020E56 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		6628E2851B3A1CCA00020E56 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		6628E2861B3A1CCA00020E56 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		6628E2871B3A1CCA00020E56 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		6628E2881B3A1CCA00020E56 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		6628E2891B3A1CCA00020E56 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		6628E28A1B3A1CCA00020E56 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		6628E28B1B3A1CCA00020E56 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		6628E28C1B3A1CCA00020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		6628E28E1B3A1CCA00020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		6628E28F1B3A1CCA00020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		941D71B41864C457007D52D8 /* EZAudioPassThroughExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioPassThroughExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		941D71B71864C457007D52D8 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		941D71BA1864C457007D52D8 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -145,50 +148,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		66755B271B3B79310013E67E /* EZAudio */ = {
+		6628E26C1B3A1CCA00020E56 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				66755B2A1B3B79310013E67E /* EZAudio.h */,
-				66755B2B1B3B79310013E67E /* EZAudio.m */,
-				66755B2C1B3B79310013E67E /* EZAudioDevice.h */,
-				66755B2D1B3B79310013E67E /* EZAudioDevice.m */,
-				66755B2E1B3B79310013E67E /* EZAudioDisplayLink.h */,
-				66755B2F1B3B79310013E67E /* EZAudioDisplayLink.m */,
-				66755B301B3B79310013E67E /* EZAudioFile.h */,
-				66755B311B3B79310013E67E /* EZAudioFile.m */,
-				66755B321B3B79310013E67E /* EZAudioFloatConverter.h */,
-				66755B331B3B79310013E67E /* EZAudioFloatConverter.m */,
-				66755B341B3B79310013E67E /* EZAudioFloatData.h */,
-				66755B351B3B79310013E67E /* EZAudioFloatData.m */,
-				66755B361B3B79310013E67E /* EZAudioPlayer.h */,
-				66755B371B3B79310013E67E /* EZAudioPlayer.m */,
-				66755B381B3B79310013E67E /* EZAudioPlot.h */,
-				66755B391B3B79310013E67E /* EZAudioPlot.m */,
-				66755B3A1B3B79310013E67E /* EZAudioPlotGL.h */,
-				66755B3B1B3B79310013E67E /* EZAudioPlotGL.m */,
-				66755B3E1B3B79310013E67E /* EZAudioUtilities.h */,
-				66755B3F1B3B79310013E67E /* EZAudioUtilities.m */,
-				66755B401B3B79310013E67E /* EZMicrophone.h */,
-				66755B411B3B79310013E67E /* EZMicrophone.m */,
-				66755B421B3B79310013E67E /* EZOutput.h */,
-				66755B431B3B79310013E67E /* EZOutput.m */,
-				66755B441B3B79310013E67E /* EZPlot.h */,
-				66755B451B3B79310013E67E /* EZPlot.m */,
-				66755B461B3B79310013E67E /* EZRecorder.h */,
-				66755B471B3B79310013E67E /* EZRecorder.m */,
-				66755B481B3B79310013E67E /* TPCircularBuffer.c */,
-				66755B491B3B79310013E67E /* TPCircularBuffer.h */,
-				66755B4A1B3B79310013E67E /* VERSION */,
+				6628E26D1B3A1CCA00020E56 /* AEFloatConverter.h */,
+				6628E26E1B3A1CCA00020E56 /* AEFloatConverter.m */,
+				6628E26F1B3A1CCA00020E56 /* EZAudio.h */,
+				6628E2701B3A1CCA00020E56 /* EZAudio.m */,
+				6628E2711B3A1CCA00020E56 /* EZAudioDevice.h */,
+				6628E2721B3A1CCA00020E56 /* EZAudioDevice.m */,
+				6628E2731B3A1CCA00020E56 /* EZAudioFile.h */,
+				6628E2741B3A1CCA00020E56 /* EZAudioFile.m */,
+				6628E2751B3A1CCA00020E56 /* EZAudioFloatConverter.h */,
+				6628E2761B3A1CCA00020E56 /* EZAudioFloatConverter.m */,
+				6628E2771B3A1CCA00020E56 /* EZAudioFloatData.h */,
+				6628E2781B3A1CCA00020E56 /* EZAudioFloatData.m */,
+				6628E2791B3A1CCA00020E56 /* EZAudioPlayer.h */,
+				6628E27A1B3A1CCA00020E56 /* EZAudioPlayer.m */,
+				6628E27B1B3A1CCA00020E56 /* EZAudioPlot.h */,
+				6628E27C1B3A1CCA00020E56 /* EZAudioPlot.m */,
+				6628E27D1B3A1CCA00020E56 /* EZAudioPlotGL.h */,
+				6628E27E1B3A1CCA00020E56 /* EZAudioPlotGL.m */,
+				6628E27F1B3A1CCA00020E56 /* EZAudioPlotGLKViewController.h */,
+				6628E2801B3A1CCA00020E56 /* EZAudioPlotGLKViewController.m */,
+				6628E2811B3A1CCA00020E56 /* EZAudioUtilities.h */,
+				6628E2821B3A1CCA00020E56 /* EZAudioUtilities.m */,
+				6628E2831B3A1CCA00020E56 /* EZMicrophone.h */,
+				6628E2841B3A1CCA00020E56 /* EZMicrophone.m */,
+				6628E2851B3A1CCA00020E56 /* EZOutput.h */,
+				6628E2861B3A1CCA00020E56 /* EZOutput.m */,
+				6628E2871B3A1CCA00020E56 /* EZPlot.h */,
+				6628E2881B3A1CCA00020E56 /* EZPlot.m */,
+				6628E2891B3A1CCA00020E56 /* EZRecorder.h */,
+				6628E28A1B3A1CCA00020E56 /* EZRecorder.m */,
+				6628E28B1B3A1CCA00020E56 /* TPCircularBuffer.c */,
+				6628E28C1B3A1CCA00020E56 /* TPCircularBuffer.h */,
+				6628E28D1B3A1CCA00020E56 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		66755B4A1B3B79310013E67E /* VERSION */ = {
+		6628E28D1B3A1CCA00020E56 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				66755B4B1B3B79310013E67E /* CHANGELOG */,
-				66755B4C1B3B79310013E67E /* VERSION */,
+				6628E28E1B3A1CCA00020E56 /* CHANGELOG */,
+				6628E28F1B3A1CCA00020E56 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -241,7 +246,7 @@
 		941D71BD1864C457007D52D8 /* EZAudioPassThroughExample */ = {
 			isa = PBXGroup;
 			children = (
-				66755B271B3B79310013E67E /* EZAudio */,
+				6628E26C1B3A1CCA00020E56 /* EZAudio */,
 				941D71C91864C457007D52D8 /* AppDelegate.h */,
 				941D71CA1864C457007D52D8 /* AppDelegate.m */,
 				941D721E1864C4D7007D52D8 /* PassThroughViewController.h */,
@@ -361,12 +366,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				941D72221864C4D7007D52D8 /* PassThroughViewController.xib in Resources */,
-				66755B5F1B3B79310013E67E /* VERSION in Resources */,
+				6628E2A11B3A1CCA00020E56 /* VERSION in Resources */,
 				941D71C21864C457007D52D8 /* InfoPlist.strings in Resources */,
 				941D71D01864C457007D52D8 /* Images.xcassets in Resources */,
 				941D71C81864C457007D52D8 /* Credits.rtf in Resources */,
 				941D71CE1864C457007D52D8 /* MainMenu.xib in Resources */,
-				66755B5E1B3B79310013E67E /* CHANGELOG in Resources */,
+				6628E2A01B3A1CCA00020E56 /* CHANGELOG in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -385,24 +390,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				66755B551B3B79310013E67E /* EZAudioPlot.m in Sources */,
-				66755B541B3B79310013E67E /* EZAudioPlayer.m in Sources */,
+				6628E29E1B3A1CCA00020E56 /* EZRecorder.m in Sources */,
 				941D72211864C4D7007D52D8 /* PassThroughViewController.m in Sources */,
-				66755B561B3B79310013E67E /* EZAudioPlotGL.m in Sources */,
-				66755B511B3B79310013E67E /* EZAudioFile.m in Sources */,
-				66755B5A1B3B79310013E67E /* EZOutput.m in Sources */,
-				66755B581B3B79310013E67E /* EZAudioUtilities.m in Sources */,
-				66755B5B1B3B79310013E67E /* EZPlot.m in Sources */,
+				6628E2941B3A1CCA00020E56 /* EZAudioFloatConverter.m in Sources */,
+				6628E2951B3A1CCA00020E56 /* EZAudioFloatData.m in Sources */,
+				6628E2901B3A1CCA00020E56 /* AEFloatConverter.m in Sources */,
+				6628E2931B3A1CCA00020E56 /* EZAudioFile.m in Sources */,
+				6628E29C1B3A1CCA00020E56 /* EZOutput.m in Sources */,
+				6628E2981B3A1CCA00020E56 /* EZAudioPlotGL.m in Sources */,
+				6628E29F1B3A1CCA00020E56 /* TPCircularBuffer.c in Sources */,
+				6628E2971B3A1CCA00020E56 /* EZAudioPlot.m in Sources */,
 				941D71CB1864C457007D52D8 /* AppDelegate.m in Sources */,
-				66755B5C1B3B79310013E67E /* EZRecorder.m in Sources */,
-				66755B531B3B79310013E67E /* EZAudioFloatData.m in Sources */,
-				66755B521B3B79310013E67E /* EZAudioFloatConverter.m in Sources */,
-				66755B501B3B79310013E67E /* EZAudioDisplayLink.m in Sources */,
-				66755B591B3B79310013E67E /* EZMicrophone.m in Sources */,
-				66755B4F1B3B79310013E67E /* EZAudioDevice.m in Sources */,
+				6628E29B1B3A1CCA00020E56 /* EZMicrophone.m in Sources */,
+				6628E2961B3A1CCA00020E56 /* EZAudioPlayer.m in Sources */,
+				6628E2921B3A1CCA00020E56 /* EZAudioDevice.m in Sources */,
 				941D71C41864C457007D52D8 /* main.m in Sources */,
-				66755B5D1B3B79310013E67E /* TPCircularBuffer.c in Sources */,
-				66755B4E1B3B79310013E67E /* EZAudio.m in Sources */,
+				6628E29D1B3A1CCA00020E56 /* EZPlot.m in Sources */,
+				6628E2911B3A1CCA00020E56 /* EZAudio.m in Sources */,
+				6628E29A1B3A1CCA00020E56 /* EZAudioUtilities.m in Sources */,
+				6628E2991B3A1CCA00020E56 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

EZAudioExamples/OSX/EZAudioPassThroughExample/EZAudioPassThroughExample/Base.lproj/MainMenu.xib

@@ -1,17 +1,100 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4439" systemVersion="13A451" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4439"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
             <connections>
+                <action selector="orderFrontStandardAboutPanel:" destination="58" id="142"/>
                 <outlet property="delegate" destination="494" id="495"/>
             </connections>
         </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder">
+            <connections>
+                <action selector="alignCenter:" destination="499" id="518"/>
+                <action selector="alignJustified:" destination="500" id="523"/>
+                <action selector="alignLeft:" destination="498" id="524"/>
+                <action selector="alignRight:" destination="501" id="521"/>
+                <action selector="arrangeInFront:" destination="5" id="39"/>
+                <action selector="capitalizeWord:" destination="466" id="467"/>
+                <action selector="centerSelectionInVisibleArea:" destination="210" id="245"/>
+                <action selector="checkSpelling:" destination="201" id="225"/>
+                <action selector="clearRecentDocuments:" destination="126" id="127"/>
+                <action selector="copy:" destination="197" id="224"/>
+                <action selector="copyFont:" destination="403" id="428"/>
+                <action selector="copyRuler:" destination="506" id="522"/>
+                <action selector="cut:" destination="199" id="228"/>
+                <action selector="delete:" destination="202" id="235"/>
+                <action selector="hide:" destination="134" id="367"/>
+                <action selector="hideOtherApplications:" destination="145" id="368"/>
+                <action selector="loosenKerning:" destination="419" id="435"/>
+                <action selector="lowerBaseline:" destination="410" id="427"/>
+                <action selector="lowercaseWord:" destination="465" id="468"/>
+                <action selector="makeBaseWritingDirectionLeftToRight:" destination="511" id="526"/>
+                <action selector="makeBaseWritingDirectionNatural:" destination="510" id="525"/>
+                <action selector="makeBaseWritingDirectionRightToLeft:" destination="512" id="527"/>
+                <action selector="makeTextWritingDirectionLeftToRight:" destination="516" id="529"/>
+                <action selector="makeTextWritingDirectionNatural:" destination="515" id="528"/>
+                <action selector="makeTextWritingDirectionRightToLeft:" destination="517" id="530"/>
+                <action selector="newDocument:" destination="82" id="373"/>
+                <action selector="openDocument:" destination="72" id="374"/>
+                <action selector="orderFrontColorPanel:" destination="401" id="433"/>
+                <action selector="orderFrontSubstitutionsPanel:" destination="457" id="458"/>
+                <action selector="paste:" destination="203" id="226"/>
+                <action selector="pasteAsPlainText:" destination="485" id="486"/>
+                <action selector="pasteFont:" destination="404" id="436"/>
+                <action selector="pasteRuler:" destination="507" id="519"/>
+                <action selector="performClose:" destination="73" id="193"/>
+                <action selector="performFindPanelAction:" destination="209" id="241"/>
+                <action selector="performFindPanelAction:" destination="208" id="487"/>
+                <action selector="performFindPanelAction:" destination="213" id="488"/>
+                <action selector="performFindPanelAction:" destination="221" id="489"/>
+                <action selector="performFindPanelAction:" destination="534" id="535"/>
+                <action selector="performMiniaturize:" destination="23" id="37"/>
+                <action selector="performZoom:" destination="239" id="240"/>
+                <action selector="print:" destination="78" id="86"/>
+                <action selector="raiseBaseline:" destination="409" id="426"/>
+                <action selector="redo:" destination="215" id="231"/>
+                <action selector="revertDocumentToSaved:" destination="112" id="364"/>
+                <action selector="runPageLayout:" destination="77" id="87"/>
+                <action selector="runToolbarCustomizationPalette:" destination="298" id="365"/>
+                <action selector="saveDocument:" destination="75" id="362"/>
+                <action selector="selectAll:" destination="198" id="232"/>
+                <action selector="showGuessPanel:" destination="204" id="230"/>
+                <action selector="showHelp:" destination="492" id="493"/>
+                <action selector="startSpeaking:" destination="196" id="233"/>
+                <action selector="stopSpeaking:" destination="195" id="227"/>
+                <action selector="subscript:" destination="408" id="429"/>
+                <action selector="superscript:" destination="407" id="430"/>
+                <action selector="tightenKerning:" destination="418" id="431"/>
+                <action selector="toggleAutomaticDashSubstitution:" destination="460" id="461"/>
+                <action selector="toggleAutomaticLinkDetection:" destination="354" id="357"/>
+                <action selector="toggleAutomaticQuoteSubstitution:" destination="351" id="356"/>
+                <action selector="toggleAutomaticSpellingCorrection:" destination="454" id="456"/>
+                <action selector="toggleAutomaticTextReplacement:" destination="462" id="463"/>
+                <action selector="toggleContinuousSpellChecking:" destination="219" id="222"/>
+                <action selector="toggleGrammarChecking:" destination="346" id="347"/>
+                <action selector="toggleRuler:" destination="505" id="520"/>
+                <action selector="toggleSmartInsertDelete:" destination="350" id="355"/>
+                <action selector="toggleToolbarShown:" destination="297" id="366"/>
+                <action selector="turnOffKerning:" destination="417" id="441"/>
+                <action selector="turnOffLigatures:" destination="413" id="440"/>
+                <action selector="underline:" destination="392" id="432"/>
+                <action selector="undo:" destination="207" id="223"/>
+                <action selector="unhideAllApplications:" destination="150" id="370"/>
+                <action selector="unscript:" destination="406" id="437"/>
+                <action selector="uppercaseWord:" destination="452" id="464"/>
+                <action selector="useAllLigatures:" destination="414" id="434"/>
+                <action selector="useStandardKerning:" destination="416" id="438"/>
+                <action selector="useStandardLigatures:" destination="412" id="439"/>
+            </connections>
+        </customObject>
+        <customObject id="-3" userLabel="Application">
+            <connections>
+                <action selector="terminate:" destination="136" id="449"/>
+            </connections>
+        </customObject>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
                 <menuItem title="EZAudioPassThroughExample" id="56">
@@ -19,9 +102,6 @@
                         <items>
                             <menuItem title="About EZAudioPassThroughExample" id="58">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="236">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
@@ -36,211 +116,95 @@
                             <menuItem isSeparatorItem="YES" id="144">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Hide EZAudioPassThroughExample" keyEquivalent="h" id="134">
-                                <connections>
-                                    <action selector="hide:" target="-1" id="367"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Hide EZAudioPassThroughExample" keyEquivalent="h" id="134"/>
                             <menuItem title="Hide Others" keyEquivalent="h" id="145">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Show All" id="150">
-                                <connections>
-                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Show All" id="150"/>
                             <menuItem isSeparatorItem="YES" id="149">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Quit EZAudioPassThroughExample" keyEquivalent="q" id="136">
-                                <connections>
-                                    <action selector="terminate:" target="-3" id="449"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Quit EZAudioPassThroughExample" keyEquivalent="q" id="136"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="File" id="83">
                     <menu key="submenu" title="File" id="81">
                         <items>
-                            <menuItem title="New" keyEquivalent="n" id="82">
-                                <connections>
-                                    <action selector="newDocument:" target="-1" id="373"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Open…" keyEquivalent="o" id="72">
-                                <connections>
-                                    <action selector="openDocument:" target="-1" id="374"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="New" keyEquivalent="n" id="82"/>
+                            <menuItem title="Open…" keyEquivalent="o" id="72"/>
                             <menuItem title="Open Recent" id="124">
                                 <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
                                     <items>
-                                        <menuItem title="Clear Menu" id="126">
-                                            <connections>
-                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Clear Menu" id="126"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="79">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Close" keyEquivalent="w" id="73">
-                                <connections>
-                                    <action selector="performClose:" target="-1" id="193"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Save…" keyEquivalent="s" id="75">
-                                <connections>
-                                    <action selector="saveDocument:" target="-1" id="362"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73"/>
+                            <menuItem title="Save…" keyEquivalent="s" id="75"/>
                             <menuItem title="Revert to Saved" id="112">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="revertDocumentToSaved:" target="-1" id="364"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="74">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Page Setup..." keyEquivalent="P" id="77">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="runPageLayout:" target="-1" id="87"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Print…" keyEquivalent="p" id="78">
-                                <connections>
-                                    <action selector="print:" target="-1" id="86"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="78"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Edit" id="217">
                     <menu key="submenu" title="Edit" id="205">
                         <items>
-                            <menuItem title="Undo" keyEquivalent="z" id="207">
-                                <connections>
-                                    <action selector="undo:" target="-1" id="223"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Undo" keyEquivalent="z" id="207"/>
                             <menuItem title="Redo" keyEquivalent="Z" id="215">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="redo:" target="-1" id="231"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="206">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Cut" keyEquivalent="x" id="199">
-                                <connections>
-                                    <action selector="cut:" target="-1" id="228"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Copy" keyEquivalent="c" id="197">
-                                <connections>
-                                    <action selector="copy:" target="-1" id="224"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste" keyEquivalent="v" id="203">
-                                <connections>
-                                    <action selector="paste:" target="-1" id="226"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="199"/>
+                            <menuItem title="Copy" keyEquivalent="c" id="197"/>
+                            <menuItem title="Paste" keyEquivalent="v" id="203"/>
                             <menuItem title="Paste and Match Style" keyEquivalent="V" id="485">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="pasteAsPlainText:" target="-1" id="486"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Delete" id="202">
-                                <connections>
-                                    <action selector="delete:" target="-1" id="235"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="198">
-                                <connections>
-                                    <action selector="selectAll:" target="-1" id="232"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Delete" id="202"/>
+                            <menuItem title="Select All" keyEquivalent="a" id="198"/>
                             <menuItem isSeparatorItem="YES" id="214">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Find" id="218">
                                 <menu key="submenu" title="Find" id="220">
                                     <items>
-                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="241"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209"/>
                                         <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="534">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="535"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="487"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208"/>
                                         <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="213">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="488"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="489"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210">
-                                            <connections>
-                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221"/>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem title="Spelling and Grammar" id="216">
                                 <menu key="submenu" title="Spelling and Grammar" id="200">
                                     <items>
-                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204">
-                                            <connections>
-                                                <action selector="showGuessPanel:" target="-1" id="230"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201">
-                                            <connections>
-                                                <action selector="checkSpelling:" target="-1" id="225"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204"/>
+                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201"/>
                                         <menuItem isSeparatorItem="YES" id="453"/>
-                                        <menuItem title="Check Spelling While Typing" id="219">
-                                            <connections>
-                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="222"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Grammar With Spelling" id="346">
-                                            <connections>
-                                                <action selector="toggleGrammarChecking:" target="-1" id="347"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Check Spelling While Typing" id="219"/>
+                                        <menuItem title="Check Grammar With Spelling" id="346"/>
                                         <menuItem title="Correct Spelling Automatically" id="454">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="456"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -250,38 +214,18 @@
                                     <items>
                                         <menuItem title="Show Substitutions" id="457">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="458"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="459"/>
-                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350">
-                                            <connections>
-                                                <action selector="toggleSmartInsertDelete:" target="-1" id="355"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351">
-                                            <connections>
-                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="356"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350"/>
+                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351"/>
                                         <menuItem title="Smart Dashes" id="460">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="461"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Smart Links" tag="3" keyEquivalent="G" id="354">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="357"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Text Replacement" id="462">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="463"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -292,21 +236,12 @@
                                     <items>
                                         <menuItem title="Make Upper Case" id="452">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="uppercaseWord:" target="-1" id="464"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Make Lower Case" id="465">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="lowercaseWord:" target="-1" id="468"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Capitalize" id="466">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="capitalizeWord:" target="-1" id="467"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -314,16 +249,8 @@
                             <menuItem title="Speech" id="211">
                                 <menu key="submenu" title="Speech" id="212">
                                     <items>
-                                        <menuItem title="Start Speaking" id="196">
-                                            <connections>
-                                                <action selector="startSpeaking:" target="-1" id="233"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Stop Speaking" id="195">
-                                            <connections>
-                                                <action selector="stopSpeaking:" target="-1" id="227"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Start Speaking" id="196"/>
+                                        <menuItem title="Stop Speaking" id="195"/>
                                     </items>
                                 </menu>
                             </menuItem>
@@ -338,37 +265,13 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Font" systemMenu="font" id="388">
                                     <items>
-                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389">
-                                            <connections>
-                                                <action selector="orderFrontFontPanel:" target="420" id="424"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="421"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="422"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Underline" keyEquivalent="u" id="392">
-                                            <connections>
-                                                <action selector="underline:" target="-1" id="432"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389"/>
+                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390"/>
+                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391"/>
+                                        <menuItem title="Underline" keyEquivalent="u" id="392"/>
                                         <menuItem isSeparatorItem="YES" id="393"/>
-                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="425"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="423"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394"/>
+                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395"/>
                                         <menuItem isSeparatorItem="YES" id="396"/>
                                         <menuItem title="Kern" id="397">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -376,27 +279,15 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="416">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardKerning:" target="-1" id="438"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="417">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffKerning:" target="-1" id="441"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Tighten" id="418">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="tightenKerning:" target="-1" id="431"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Loosen" id="419">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="loosenKerning:" target="-1" id="435"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -407,21 +298,12 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="412">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardLigatures:" target="-1" id="439"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="413">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffLigatures:" target="-1" id="440"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use All" id="414">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useAllLigatures:" target="-1" id="434"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -432,55 +314,30 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="406">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="unscript:" target="-1" id="437"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Superscript" id="407">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="superscript:" target="-1" id="430"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Subscript" id="408">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="subscript:" target="-1" id="429"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Raise" id="409">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="raiseBaseline:" target="-1" id="426"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Lower" id="410">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="lowerBaseline:" target="-1" id="427"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="400"/>
-                                        <menuItem title="Show Colors" keyEquivalent="C" id="401">
-                                            <connections>
-                                                <action selector="orderFrontColorPanel:" target="-1" id="433"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Colors" keyEquivalent="C" id="401"/>
                                         <menuItem isSeparatorItem="YES" id="402"/>
                                         <menuItem title="Copy Style" keyEquivalent="c" id="403">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyFont:" target="-1" id="428"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Style" keyEquivalent="v" id="404">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteFont:" target="-1" id="436"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -489,27 +346,12 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Text" id="497">
                                     <items>
-                                        <menuItem title="Align Left" keyEquivalent="{" id="498">
-                                            <connections>
-                                                <action selector="alignLeft:" target="-1" id="524"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Center" keyEquivalent="|" id="499">
-                                            <connections>
-                                                <action selector="alignCenter:" target="-1" id="518"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Align Left" keyEquivalent="{" id="498"/>
+                                        <menuItem title="Center" keyEquivalent="|" id="499"/>
                                         <menuItem title="Justify" id="500">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="alignJustified:" target="-1" id="523"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Align Right" keyEquivalent="}" id="501">
-                                            <connections>
-                                                <action selector="alignRight:" target="-1" id="521"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Align Right" keyEquivalent="}" id="501"/>
                                         <menuItem isSeparatorItem="YES" id="502"/>
                                         <menuItem title="Writing Direction" id="503">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -521,23 +363,14 @@
                                                     <menuItem id="510">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionNatural:" target="-1" id="525"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="511">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="526"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="512">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="527"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem isSeparatorItem="YES" id="513"/>
                                                     <menuItem title="Selection" enabled="NO" id="514">
@@ -546,23 +379,14 @@
                                                     <menuItem id="515">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionNatural:" target="-1" id="528"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="516">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="529"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="517">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="530"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -570,21 +394,12 @@
                                         <menuItem isSeparatorItem="YES" id="504"/>
                                         <menuItem title="Show Ruler" id="505">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleRuler:" target="-1" id="520"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Copy Ruler" keyEquivalent="c" id="506">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyRuler:" target="-1" id="522"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Ruler" keyEquivalent="v" id="507">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteRuler:" target="-1" id="519"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -597,39 +412,20 @@
                         <items>
                             <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleToolbarShown:" target="-1" id="366"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Customize Toolbar…" id="298">
-                                <connections>
-                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="365"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Customize Toolbar…" id="298"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Window" id="19">
                     <menu key="submenu" title="Window" systemMenu="window" id="24">
                         <items>
-                            <menuItem title="Minimize" keyEquivalent="m" id="23">
-                                <connections>
-                                    <action selector="performMiniaturize:" target="-1" id="37"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Zoom" id="239">
-                                <connections>
-                                    <action selector="performZoom:" target="-1" id="240"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23"/>
+                            <menuItem title="Zoom" id="239"/>
                             <menuItem isSeparatorItem="YES" id="92">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Bring All to Front" id="5">
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="39"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5"/>
                         </items>
                     </menu>
                 </menuItem>
@@ -637,21 +433,17 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="491">
                         <items>
-                            <menuItem title="EZAudioPassThroughExample Help" keyEquivalent="?" id="492">
-                                <connections>
-                                    <action selector="showHelp:" target="-1" id="493"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="EZAudioPassThroughExample Help" keyEquivalent="?" id="492"/>
                         </items>
                     </menu>
                 </menuItem>
             </items>
         </menu>
         <window title="EZAudioPassThroughExample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <view key="contentView" id="372">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -662,6 +454,14 @@
                 <outlet property="window" destination="371" id="532"/>
             </connections>
         </customObject>
-        <customObject id="420" customClass="NSFontManager"/>
+        <customObject id="420" customClass="NSFontManager">
+            <connections>
+                <action selector="addFontTrait:" destination="390" id="421"/>
+                <action selector="addFontTrait:" destination="391" id="422"/>
+                <action selector="modifyFont:" destination="395" id="423"/>
+                <action selector="modifyFont:" destination="394" id="425"/>
+                <action selector="orderFrontFontPanel:" destination="389" id="424"/>
+            </connections>
+        </customObject>
     </objects>
 </document>

EZAudioExamples/OSX/EZAudioPassThroughExample/EZAudioPassThroughExample/PassThroughViewController.h

@@ -30,7 +30,7 @@
  */
 #import "EZAudio.h"
 
-@interface PassThroughViewController : NSViewController <EZMicrophoneDelegate>
+@interface PassThroughViewController : NSViewController <EZMicrophoneDelegate,EZOutputDataSource>
 
 //------------------------------------------------------------------------------
 #pragma mark - Components
@@ -39,14 +39,7 @@
 /**
  The OpenGL based audio plot
  */
-@property (nonatomic, weak) IBOutlet EZAudioPlotGL *audioPlot;
-
-//------------------------------------------------------------------------------
-
-/**
- The label used to display the microphone state
- */
-@property (nonatomic, weak) IBOutlet NSButton *microphoneSwitch;
+@property (nonatomic,weak) IBOutlet EZAudioPlotGL *audioPlot;
 
 //------------------------------------------------------------------------------
 #pragma mark - Actions

EZAudioExamples/OSX/EZAudioPassThroughExample/EZAudioPassThroughExample/PassThroughViewController.m

@@ -132,14 +132,6 @@
 #pragma mark - EZMicrophoneDelegate
 //------------------------------------------------------------------------------
 
-- (void)microphone:(EZMicrophone *)microphone changedPlayingState:(BOOL)isPlaying
-{
-    NSString *title = isPlaying ? @"Microphone On" : @"Microphone Off";
-    [self setTitle:title forButton:self.microphoneSwitch];
-}
-
-//------------------------------------------------------------------------------
-
 -(void)    microphone:(EZMicrophone *)microphone
      hasAudioReceived:(float **)buffer
        withBufferSize:(UInt32)bufferSize
@@ -152,19 +144,6 @@
     });
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Utility
-//------------------------------------------------------------------------------
-
-- (void)setTitle:(NSString *)title forButton:(NSButton *)button
-{
-    NSDictionary *attributes = @{ NSForegroundColorAttributeName : [NSColor whiteColor] };
-    NSAttributedString *attributedTitle = [[NSAttributedString alloc] initWithString:title
-                                                                          attributes:attributes];
-    button.attributedTitle = attributedTitle;
-    button.attributedAlternateTitle = attributedTitle;
-}
-
 //------------------------------------------------------------------------------
 
 @end

EZAudioExamples/OSX/EZAudioPassThroughExample/EZAudioPassThroughExample/PassThroughViewController.xib

@@ -1,89 +1,69 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="PassThroughViewController">
             <connections>
                 <outlet property="audioPlot" destination="szV-uu-KbA" id="KwB-bl-yeS"/>
-                <outlet property="microphoneSwitch" destination="hej-uQ-uG1" id="fhN-xl-LNP"/>
                 <outlet property="view" destination="1d9-8y-ung" id="BT4-Db-KNk"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="-3" userLabel="Application"/>
         <customView id="1d9-8y-ung">
             <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="szV-uu-KbA" customClass="EZAudioPlotGL">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
-                    <subviews>
-                        <box autoresizesSubviews="NO" title="Box" boxType="custom" borderType="none" translatesAutoresizingMaskIntoConstraints="NO" id="eSf-nW-gda">
-                            <rect key="frame" x="0.0" y="0.0" width="480" height="57"/>
-                            <view key="contentView">
-                                <rect key="frame" x="0.0" y="0.0" width="480" height="57"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="hej-uQ-uG1">
-                                        <rect key="frame" x="16" y="16" width="119" height="18"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="14" id="fd8-mW-5iG"/>
-                                            <constraint firstAttribute="width" constant="115" id="znu-AU-bWg"/>
-                                        </constraints>
-                                        <buttonCell key="cell" type="check" title="Microphone On" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="k97-dB-fHu">
-                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="toggleMicrophone:" target="-2" id="ofz-vX-IjK"/>
-                                        </connections>
-                                    </button>
-                                    <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sPx-Eg-cI6">
-                                        <rect key="frame" x="335" y="16" width="129" height="24"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="125" id="JlH-Js-Z1d"/>
-                                            <constraint firstAttribute="height" constant="21" id="hEY-sc-Ib0"/>
-                                        </constraints>
-                                        <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="q61-MR-tCv">
-                                            <font key="font" metaFont="system"/>
-                                            <segments>
-                                                <segment label="Buffer" selected="YES"/>
-                                                <segment label="Rolling" tag="1"/>
-                                            </segments>
-                                        </segmentedCell>
-                                        <connections>
-                                            <action selector="changePlotType:" target="-2" id="UVX-Mg-yXi"/>
-                                        </connections>
-                                    </segmentedControl>
-                                </subviews>
-                            </view>
-                            <constraints>
-                                <constraint firstAttribute="trailing" secondItem="sPx-Eg-cI6" secondAttribute="trailing" constant="18" id="3dz-EL-GYk"/>
-                                <constraint firstItem="hej-uQ-uG1" firstAttribute="leading" secondItem="eSf-nW-gda" secondAttribute="leading" constant="18" id="QRY-A3-l3d"/>
-                                <constraint firstItem="sPx-Eg-cI6" firstAttribute="centerY" secondItem="eSf-nW-gda" secondAttribute="centerY" id="ZiD-Mc-F6Z"/>
-                                <constraint firstItem="sPx-Eg-cI6" firstAttribute="bottom" secondItem="hej-uQ-uG1" secondAttribute="bottom" id="kMA-Gc-Asn"/>
-                                <constraint firstAttribute="height" constant="57" id="q54-Ma-rT2"/>
-                            </constraints>
-                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                            <color key="fillColor" red="0.0" green="0.0" blue="0.0" alpha="0.70000000000000007" colorSpace="calibratedRGB"/>
-                        </box>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="eSf-nW-gda" firstAttribute="leading" secondItem="szV-uu-KbA" secondAttribute="leading" id="n5W-wG-XMz"/>
-                        <constraint firstAttribute="bottom" secondItem="eSf-nW-gda" secondAttribute="bottom" id="ob1-us-1L5"/>
-                        <constraint firstAttribute="trailing" secondItem="eSf-nW-gda" secondAttribute="trailing" id="pGc-Rn-8IL"/>
-                    </constraints>
+                    <rect key="frame" x="0.0" y="42" width="480" height="230"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                 </customView>
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="hej-uQ-uG1">
+                    <rect key="frame" x="18" y="14" width="119" height="18"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="14" id="fd8-mW-5iG"/>
+                    </constraints>
+                    <buttonCell key="cell" type="check" title="Microphone On" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="k97-dB-fHu">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="toggleMicrophone:" target="-2" id="ofz-vX-IjK"/>
+                    </connections>
+                </button>
+                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sPx-Eg-cI6">
+                    <rect key="frame" x="333" y="11" width="129" height="24"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="21" id="hEY-sc-Ib0"/>
+                    </constraints>
+                    <segmentedCell key="cell" alignment="left" style="rounded" trackingMode="selectOne" id="q61-MR-tCv">
+                        <font key="font" metaFont="system"/>
+                        <segments>
+                            <segment label="Buffer" selected="YES"/>
+                            <segment label="Rolling" tag="1"/>
+                        </segments>
+                    </segmentedCell>
+                    <connections>
+                        <action selector="changePlotType:" target="-2" id="UVX-Mg-yXi"/>
+                    </connections>
+                </segmentedControl>
             </subviews>
             <constraints>
-                <constraint firstAttribute="bottom" secondItem="szV-uu-KbA" secondAttribute="bottom" id="8NU-Oj-lK1"/>
                 <constraint firstAttribute="trailing" secondItem="szV-uu-KbA" secondAttribute="trailing" id="AVW-CO-N2Q"/>
                 <constraint firstItem="szV-uu-KbA" firstAttribute="top" secondItem="1d9-8y-ung" secondAttribute="top" id="DM4-bU-zuP"/>
+                <constraint firstItem="sPx-Eg-cI6" firstAttribute="top" secondItem="szV-uu-KbA" secondAttribute="bottom" constant="8" id="EFb-mI-KZS"/>
+                <constraint firstAttribute="trailing" secondItem="sPx-Eg-cI6" secondAttribute="trailing" constant="20" id="MiO-PO-tmm"/>
+                <constraint firstItem="hej-uQ-uG1" firstAttribute="leading" secondItem="1d9-8y-ung" secondAttribute="leading" constant="20" id="NJE-fd-586"/>
                 <constraint firstItem="szV-uu-KbA" firstAttribute="leading" secondItem="1d9-8y-ung" secondAttribute="leading" id="Qkq-oi-gx2"/>
+                <constraint firstAttribute="bottom" secondItem="hej-uQ-uG1" secondAttribute="bottom" constant="16" id="UXq-4r-K0N"/>
+                <constraint firstAttribute="bottom" secondItem="sPx-Eg-cI6" secondAttribute="bottom" constant="13" id="V0F-aH-MAE"/>
+                <constraint firstItem="hej-uQ-uG1" firstAttribute="top" secondItem="szV-uu-KbA" secondAttribute="bottom" constant="12" id="cPy-qk-vL2"/>
             </constraints>
         </customView>
     </objects>
-</document>
+</document>

EZAudioExamples/OSX/EZAudioPlayFileExample/EZAudioPlayFileExample.xcodeproj/project.pbxproj

@@ -8,23 +8,24 @@
 
 /* Begin PBXBuildFile section */
 		6628E2351B3A121A00020E56 /* simple-drum-beat.wav in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2341B3A121A00020E56 /* simple-drum-beat.wav */; };
-		66755AA31B3B791C0013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A801B3B791C0013E67E /* EZAudio.m */; };
-		66755AA41B3B791C0013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A821B3B791C0013E67E /* EZAudioDevice.m */; };
-		66755AA51B3B791C0013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A841B3B791C0013E67E /* EZAudioDisplayLink.m */; };
-		66755AA61B3B791C0013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A861B3B791C0013E67E /* EZAudioFile.m */; };
-		66755AA71B3B791C0013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A881B3B791C0013E67E /* EZAudioFloatConverter.m */; };
-		66755AA81B3B791C0013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A8A1B3B791C0013E67E /* EZAudioFloatData.m */; };
-		66755AA91B3B791C0013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A8C1B3B791C0013E67E /* EZAudioPlayer.m */; };
-		66755AAA1B3B791C0013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A8E1B3B791C0013E67E /* EZAudioPlot.m */; };
-		66755AAB1B3B791C0013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A901B3B791C0013E67E /* EZAudioPlotGL.m */; };
-		66755AAD1B3B791C0013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A941B3B791C0013E67E /* EZAudioUtilities.m */; };
-		66755AAE1B3B791C0013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A961B3B791C0013E67E /* EZMicrophone.m */; };
-		66755AAF1B3B791C0013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A981B3B791C0013E67E /* EZOutput.m */; };
-		66755AB01B3B791C0013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A9A1B3B791C0013E67E /* EZPlot.m */; };
-		66755AB11B3B791C0013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755A9C1B3B791C0013E67E /* EZRecorder.m */; };
-		66755AB21B3B791C0013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 66755A9D1B3B791C0013E67E /* TPCircularBuffer.c */; };
-		66755AB31B3B791C0013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 66755AA01B3B791C0013E67E /* CHANGELOG */; };
-		66755AB41B3B791C0013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 66755AA11B3B791C0013E67E /* VERSION */; };
+		6659578A1B38B352003E97A1 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957681B38B352003E97A1 /* AEFloatConverter.m */; };
+		6659578B1B38B352003E97A1 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659576A1B38B352003E97A1 /* EZAudio.m */; };
+		6659578C1B38B352003E97A1 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659576C1B38B352003E97A1 /* EZAudioDevice.m */; };
+		6659578D1B38B352003E97A1 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659576E1B38B352003E97A1 /* EZAudioFile.m */; };
+		6659578E1B38B352003E97A1 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957701B38B352003E97A1 /* EZAudioFloatConverter.m */; };
+		6659578F1B38B352003E97A1 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957721B38B352003E97A1 /* EZAudioFloatData.m */; };
+		665957901B38B352003E97A1 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957741B38B352003E97A1 /* EZAudioPlayer.m */; };
+		665957911B38B352003E97A1 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957761B38B352003E97A1 /* EZAudioPlot.m */; };
+		665957921B38B352003E97A1 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957781B38B352003E97A1 /* EZAudioPlotGL.m */; };
+		665957931B38B352003E97A1 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659577A1B38B352003E97A1 /* EZAudioPlotGLKViewController.m */; };
+		665957941B38B352003E97A1 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659577C1B38B352003E97A1 /* EZAudioUtilities.m */; };
+		665957951B38B352003E97A1 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659577E1B38B352003E97A1 /* EZMicrophone.m */; };
+		665957961B38B352003E97A1 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957801B38B352003E97A1 /* EZOutput.m */; };
+		665957971B38B352003E97A1 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957821B38B352003E97A1 /* EZPlot.m */; };
+		665957981B38B352003E97A1 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957841B38B352003E97A1 /* EZRecorder.m */; };
+		665957991B38B352003E97A1 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 665957851B38B352003E97A1 /* TPCircularBuffer.c */; };
+		6659579A1B38B352003E97A1 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 665957881B38B352003E97A1 /* CHANGELOG */; };
+		6659579B1B38B352003E97A1 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 665957891B38B352003E97A1 /* VERSION */; };
 		94056EFB185BD83400EB94BA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94056EFA185BD83400EB94BA /* Cocoa.framework */; };
 		94056F05185BD83400EB94BA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 94056F03185BD83400EB94BA /* InfoPlist.strings */; };
 		94056F07185BD83400EB94BA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 94056F06185BD83400EB94BA /* main.m */; };
@@ -58,38 +59,40 @@
 
 /* Begin PBXFileReference section */
 		6628E2341B3A121A00020E56 /* simple-drum-beat.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "simple-drum-beat.wav"; path = "../../../simple-drum-beat.wav"; sourceTree = "<group>"; };
-		66755A7F1B3B791C0013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		66755A801B3B791C0013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		66755A811B3B791C0013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		66755A821B3B791C0013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		66755A831B3B791C0013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		66755A841B3B791C0013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		66755A851B3B791C0013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		66755A861B3B791C0013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		66755A871B3B791C0013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		66755A881B3B791C0013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		66755A891B3B791C0013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		66755A8A1B3B791C0013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		66755A8B1B3B791C0013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		66755A8C1B3B791C0013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		66755A8D1B3B791C0013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		66755A8E1B3B791C0013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		66755A8F1B3B791C0013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		66755A901B3B791C0013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		66755A931B3B791C0013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		66755A941B3B791C0013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		66755A951B3B791C0013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		66755A961B3B791C0013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		66755A971B3B791C0013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		66755A981B3B791C0013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		66755A991B3B791C0013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		66755A9A1B3B791C0013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		66755A9B1B3B791C0013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		66755A9C1B3B791C0013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		66755A9D1B3B791C0013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		66755A9E1B3B791C0013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		66755AA01B3B791C0013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		66755AA11B3B791C0013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		665957671B38B352003E97A1 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		665957681B38B352003E97A1 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		665957691B38B352003E97A1 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		6659576A1B38B352003E97A1 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		6659576B1B38B352003E97A1 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		6659576C1B38B352003E97A1 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		6659576D1B38B352003E97A1 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		6659576E1B38B352003E97A1 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		6659576F1B38B352003E97A1 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		665957701B38B352003E97A1 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		665957711B38B352003E97A1 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		665957721B38B352003E97A1 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		665957731B38B352003E97A1 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		665957741B38B352003E97A1 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		665957751B38B352003E97A1 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		665957761B38B352003E97A1 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		665957771B38B352003E97A1 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		665957781B38B352003E97A1 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		665957791B38B352003E97A1 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		6659577A1B38B352003E97A1 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		6659577B1B38B352003E97A1 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		6659577C1B38B352003E97A1 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		6659577D1B38B352003E97A1 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		6659577E1B38B352003E97A1 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		6659577F1B38B352003E97A1 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		665957801B38B352003E97A1 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		665957811B38B352003E97A1 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		665957821B38B352003E97A1 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		665957831B38B352003E97A1 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		665957841B38B352003E97A1 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		665957851B38B352003E97A1 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		665957861B38B352003E97A1 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		665957881B38B352003E97A1 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		665957891B38B352003E97A1 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		94056EF7185BD83400EB94BA /* EZAudioPlayFileExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioPlayFileExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		94056EFA185BD83400EB94BA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		94056EFD185BD83400EB94BA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -147,50 +150,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		66755A7C1B3B791C0013E67E /* EZAudio */ = {
+		665957661B38B352003E97A1 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				66755A7F1B3B791C0013E67E /* EZAudio.h */,
-				66755A801B3B791C0013E67E /* EZAudio.m */,
-				66755A811B3B791C0013E67E /* EZAudioDevice.h */,
-				66755A821B3B791C0013E67E /* EZAudioDevice.m */,
-				66755A831B3B791C0013E67E /* EZAudioDisplayLink.h */,
-				66755A841B3B791C0013E67E /* EZAudioDisplayLink.m */,
-				66755A851B3B791C0013E67E /* EZAudioFile.h */,
-				66755A861B3B791C0013E67E /* EZAudioFile.m */,
-				66755A871B3B791C0013E67E /* EZAudioFloatConverter.h */,
-				66755A881B3B791C0013E67E /* EZAudioFloatConverter.m */,
-				66755A891B3B791C0013E67E /* EZAudioFloatData.h */,
-				66755A8A1B3B791C0013E67E /* EZAudioFloatData.m */,
-				66755A8B1B3B791C0013E67E /* EZAudioPlayer.h */,
-				66755A8C1B3B791C0013E67E /* EZAudioPlayer.m */,
-				66755A8D1B3B791C0013E67E /* EZAudioPlot.h */,
-				66755A8E1B3B791C0013E67E /* EZAudioPlot.m */,
-				66755A8F1B3B791C0013E67E /* EZAudioPlotGL.h */,
-				66755A901B3B791C0013E67E /* EZAudioPlotGL.m */,
-				66755A931B3B791C0013E67E /* EZAudioUtilities.h */,
-				66755A941B3B791C0013E67E /* EZAudioUtilities.m */,
-				66755A951B3B791C0013E67E /* EZMicrophone.h */,
-				66755A961B3B791C0013E67E /* EZMicrophone.m */,
-				66755A971B3B791C0013E67E /* EZOutput.h */,
-				66755A981B3B791C0013E67E /* EZOutput.m */,
-				66755A991B3B791C0013E67E /* EZPlot.h */,
-				66755A9A1B3B791C0013E67E /* EZPlot.m */,
-				66755A9B1B3B791C0013E67E /* EZRecorder.h */,
-				66755A9C1B3B791C0013E67E /* EZRecorder.m */,
-				66755A9D1B3B791C0013E67E /* TPCircularBuffer.c */,
-				66755A9E1B3B791C0013E67E /* TPCircularBuffer.h */,
-				66755A9F1B3B791C0013E67E /* VERSION */,
+				665957671B38B352003E97A1 /* AEFloatConverter.h */,
+				665957681B38B352003E97A1 /* AEFloatConverter.m */,
+				665957691B38B352003E97A1 /* EZAudio.h */,
+				6659576A1B38B352003E97A1 /* EZAudio.m */,
+				6659576B1B38B352003E97A1 /* EZAudioDevice.h */,
+				6659576C1B38B352003E97A1 /* EZAudioDevice.m */,
+				6659576D1B38B352003E97A1 /* EZAudioFile.h */,
+				6659576E1B38B352003E97A1 /* EZAudioFile.m */,
+				6659576F1B38B352003E97A1 /* EZAudioFloatConverter.h */,
+				665957701B38B352003E97A1 /* EZAudioFloatConverter.m */,
+				665957711B38B352003E97A1 /* EZAudioFloatData.h */,
+				665957721B38B352003E97A1 /* EZAudioFloatData.m */,
+				665957731B38B352003E97A1 /* EZAudioPlayer.h */,
+				665957741B38B352003E97A1 /* EZAudioPlayer.m */,
+				665957751B38B352003E97A1 /* EZAudioPlot.h */,
+				665957761B38B352003E97A1 /* EZAudioPlot.m */,
+				665957771B38B352003E97A1 /* EZAudioPlotGL.h */,
+				665957781B38B352003E97A1 /* EZAudioPlotGL.m */,
+				665957791B38B352003E97A1 /* EZAudioPlotGLKViewController.h */,
+				6659577A1B38B352003E97A1 /* EZAudioPlotGLKViewController.m */,
+				6659577B1B38B352003E97A1 /* EZAudioUtilities.h */,
+				6659577C1B38B352003E97A1 /* EZAudioUtilities.m */,
+				6659577D1B38B352003E97A1 /* EZMicrophone.h */,
+				6659577E1B38B352003E97A1 /* EZMicrophone.m */,
+				6659577F1B38B352003E97A1 /* EZOutput.h */,
+				665957801B38B352003E97A1 /* EZOutput.m */,
+				665957811B38B352003E97A1 /* EZPlot.h */,
+				665957821B38B352003E97A1 /* EZPlot.m */,
+				665957831B38B352003E97A1 /* EZRecorder.h */,
+				665957841B38B352003E97A1 /* EZRecorder.m */,
+				665957851B38B352003E97A1 /* TPCircularBuffer.c */,
+				665957861B38B352003E97A1 /* TPCircularBuffer.h */,
+				665957871B38B352003E97A1 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		66755A9F1B3B791C0013E67E /* VERSION */ = {
+		665957871B38B352003E97A1 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				66755AA01B3B791C0013E67E /* CHANGELOG */,
-				66755AA11B3B791C0013E67E /* VERSION */,
+				665957881B38B352003E97A1 /* CHANGELOG */,
+				665957891B38B352003E97A1 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -243,7 +248,7 @@
 		94056F00185BD83400EB94BA /* EZAudioPlayFileExample */ = {
 			isa = PBXGroup;
 			children = (
-				66755A7C1B3B791C0013E67E /* EZAudio */,
+				665957661B38B352003E97A1 /* EZAudio */,
 				94056F0C185BD83400EB94BA /* AppDelegate.h */,
 				94056F0D185BD83400EB94BA /* AppDelegate.m */,
 				94056F2E185BD86D00EB94BA /* PlayFileViewController.h */,
@@ -365,10 +370,10 @@
 			files = (
 				6628E2351B3A121A00020E56 /* simple-drum-beat.wav in Resources */,
 				94056F05185BD83400EB94BA /* InfoPlist.strings in Resources */,
-				66755AB31B3B791C0013E67E /* CHANGELOG in Resources */,
 				94056F13185BD83400EB94BA /* Images.xcassets in Resources */,
+				6659579A1B38B352003E97A1 /* CHANGELOG in Resources */,
 				94056F0B185BD83400EB94BA /* Credits.rtf in Resources */,
-				66755AB41B3B791C0013E67E /* VERSION in Resources */,
+				6659579B1B38B352003E97A1 /* VERSION in Resources */,
 				94056F32185BD86D00EB94BA /* PlayFileViewController.xib in Resources */,
 				94056F11185BD83400EB94BA /* MainMenu.xib in Resources */,
 			);
@@ -389,24 +394,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				66755AAA1B3B791C0013E67E /* EZAudioPlot.m in Sources */,
-				66755AA91B3B791C0013E67E /* EZAudioPlayer.m in Sources */,
+				665957981B38B352003E97A1 /* EZRecorder.m in Sources */,
 				94056F31185BD86D00EB94BA /* PlayFileViewController.m in Sources */,
-				66755AAB1B3B791C0013E67E /* EZAudioPlotGL.m in Sources */,
-				66755AA61B3B791C0013E67E /* EZAudioFile.m in Sources */,
-				66755AAF1B3B791C0013E67E /* EZOutput.m in Sources */,
-				66755AAD1B3B791C0013E67E /* EZAudioUtilities.m in Sources */,
-				66755AB01B3B791C0013E67E /* EZPlot.m in Sources */,
+				6659578E1B38B352003E97A1 /* EZAudioFloatConverter.m in Sources */,
+				6659578F1B38B352003E97A1 /* EZAudioFloatData.m in Sources */,
+				6659578A1B38B352003E97A1 /* AEFloatConverter.m in Sources */,
+				6659578D1B38B352003E97A1 /* EZAudioFile.m in Sources */,
+				665957961B38B352003E97A1 /* EZOutput.m in Sources */,
+				665957921B38B352003E97A1 /* EZAudioPlotGL.m in Sources */,
+				665957991B38B352003E97A1 /* TPCircularBuffer.c in Sources */,
+				665957911B38B352003E97A1 /* EZAudioPlot.m in Sources */,
 				94056F0E185BD83400EB94BA /* AppDelegate.m in Sources */,
-				66755AB11B3B791C0013E67E /* EZRecorder.m in Sources */,
-				66755AA81B3B791C0013E67E /* EZAudioFloatData.m in Sources */,
-				66755AA71B3B791C0013E67E /* EZAudioFloatConverter.m in Sources */,
-				66755AA51B3B791C0013E67E /* EZAudioDisplayLink.m in Sources */,
-				66755AAE1B3B791C0013E67E /* EZMicrophone.m in Sources */,
-				66755AA41B3B791C0013E67E /* EZAudioDevice.m in Sources */,
+				665957951B38B352003E97A1 /* EZMicrophone.m in Sources */,
+				665957901B38B352003E97A1 /* EZAudioPlayer.m in Sources */,
+				6659578C1B38B352003E97A1 /* EZAudioDevice.m in Sources */,
 				94056F07185BD83400EB94BA /* main.m in Sources */,
-				66755AB21B3B791C0013E67E /* TPCircularBuffer.c in Sources */,
-				66755AA31B3B791C0013E67E /* EZAudio.m in Sources */,
+				665957971B38B352003E97A1 /* EZPlot.m in Sources */,
+				6659578B1B38B352003E97A1 /* EZAudio.m in Sources */,
+				665957941B38B352003E97A1 /* EZAudioUtilities.m in Sources */,
+				665957931B38B352003E97A1 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

EZAudioExamples/OSX/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/MainMenu.xib

@@ -1,17 +1,100 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4439" systemVersion="13A451" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4439"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
             <connections>
+                <action selector="orderFrontStandardAboutPanel:" destination="58" id="142"/>
                 <outlet property="delegate" destination="494" id="495"/>
             </connections>
         </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder">
+            <connections>
+                <action selector="alignCenter:" destination="499" id="518"/>
+                <action selector="alignJustified:" destination="500" id="523"/>
+                <action selector="alignLeft:" destination="498" id="524"/>
+                <action selector="alignRight:" destination="501" id="521"/>
+                <action selector="arrangeInFront:" destination="5" id="39"/>
+                <action selector="capitalizeWord:" destination="466" id="467"/>
+                <action selector="centerSelectionInVisibleArea:" destination="210" id="245"/>
+                <action selector="checkSpelling:" destination="201" id="225"/>
+                <action selector="clearRecentDocuments:" destination="126" id="127"/>
+                <action selector="copy:" destination="197" id="224"/>
+                <action selector="copyFont:" destination="403" id="428"/>
+                <action selector="copyRuler:" destination="506" id="522"/>
+                <action selector="cut:" destination="199" id="228"/>
+                <action selector="delete:" destination="202" id="235"/>
+                <action selector="hide:" destination="134" id="367"/>
+                <action selector="hideOtherApplications:" destination="145" id="368"/>
+                <action selector="loosenKerning:" destination="419" id="435"/>
+                <action selector="lowerBaseline:" destination="410" id="427"/>
+                <action selector="lowercaseWord:" destination="465" id="468"/>
+                <action selector="makeBaseWritingDirectionLeftToRight:" destination="511" id="526"/>
+                <action selector="makeBaseWritingDirectionNatural:" destination="510" id="525"/>
+                <action selector="makeBaseWritingDirectionRightToLeft:" destination="512" id="527"/>
+                <action selector="makeTextWritingDirectionLeftToRight:" destination="516" id="529"/>
+                <action selector="makeTextWritingDirectionNatural:" destination="515" id="528"/>
+                <action selector="makeTextWritingDirectionRightToLeft:" destination="517" id="530"/>
+                <action selector="newDocument:" destination="82" id="373"/>
+                <action selector="openDocument:" destination="72" id="374"/>
+                <action selector="orderFrontColorPanel:" destination="401" id="433"/>
+                <action selector="orderFrontSubstitutionsPanel:" destination="457" id="458"/>
+                <action selector="paste:" destination="203" id="226"/>
+                <action selector="pasteAsPlainText:" destination="485" id="486"/>
+                <action selector="pasteFont:" destination="404" id="436"/>
+                <action selector="pasteRuler:" destination="507" id="519"/>
+                <action selector="performClose:" destination="73" id="193"/>
+                <action selector="performFindPanelAction:" destination="209" id="241"/>
+                <action selector="performFindPanelAction:" destination="208" id="487"/>
+                <action selector="performFindPanelAction:" destination="213" id="488"/>
+                <action selector="performFindPanelAction:" destination="221" id="489"/>
+                <action selector="performFindPanelAction:" destination="534" id="535"/>
+                <action selector="performMiniaturize:" destination="23" id="37"/>
+                <action selector="performZoom:" destination="239" id="240"/>
+                <action selector="print:" destination="78" id="86"/>
+                <action selector="raiseBaseline:" destination="409" id="426"/>
+                <action selector="redo:" destination="215" id="231"/>
+                <action selector="revertDocumentToSaved:" destination="112" id="364"/>
+                <action selector="runPageLayout:" destination="77" id="87"/>
+                <action selector="runToolbarCustomizationPalette:" destination="298" id="365"/>
+                <action selector="saveDocument:" destination="75" id="362"/>
+                <action selector="selectAll:" destination="198" id="232"/>
+                <action selector="showGuessPanel:" destination="204" id="230"/>
+                <action selector="showHelp:" destination="492" id="493"/>
+                <action selector="startSpeaking:" destination="196" id="233"/>
+                <action selector="stopSpeaking:" destination="195" id="227"/>
+                <action selector="subscript:" destination="408" id="429"/>
+                <action selector="superscript:" destination="407" id="430"/>
+                <action selector="tightenKerning:" destination="418" id="431"/>
+                <action selector="toggleAutomaticDashSubstitution:" destination="460" id="461"/>
+                <action selector="toggleAutomaticLinkDetection:" destination="354" id="357"/>
+                <action selector="toggleAutomaticQuoteSubstitution:" destination="351" id="356"/>
+                <action selector="toggleAutomaticSpellingCorrection:" destination="454" id="456"/>
+                <action selector="toggleAutomaticTextReplacement:" destination="462" id="463"/>
+                <action selector="toggleContinuousSpellChecking:" destination="219" id="222"/>
+                <action selector="toggleGrammarChecking:" destination="346" id="347"/>
+                <action selector="toggleRuler:" destination="505" id="520"/>
+                <action selector="toggleSmartInsertDelete:" destination="350" id="355"/>
+                <action selector="toggleToolbarShown:" destination="297" id="366"/>
+                <action selector="turnOffKerning:" destination="417" id="441"/>
+                <action selector="turnOffLigatures:" destination="413" id="440"/>
+                <action selector="underline:" destination="392" id="432"/>
+                <action selector="undo:" destination="207" id="223"/>
+                <action selector="unhideAllApplications:" destination="150" id="370"/>
+                <action selector="unscript:" destination="406" id="437"/>
+                <action selector="uppercaseWord:" destination="452" id="464"/>
+                <action selector="useAllLigatures:" destination="414" id="434"/>
+                <action selector="useStandardKerning:" destination="416" id="438"/>
+                <action selector="useStandardLigatures:" destination="412" id="439"/>
+            </connections>
+        </customObject>
+        <customObject id="-3" userLabel="Application">
+            <connections>
+                <action selector="terminate:" destination="136" id="449"/>
+            </connections>
+        </customObject>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
                 <menuItem title="EZAudioPlayFileExample" id="56">
@@ -19,9 +102,6 @@
                         <items>
                             <menuItem title="About EZAudioPlayFileExample" id="58">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="236">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
@@ -36,211 +116,95 @@
                             <menuItem isSeparatorItem="YES" id="144">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Hide EZAudioPlayFileExample" keyEquivalent="h" id="134">
-                                <connections>
-                                    <action selector="hide:" target="-1" id="367"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Hide EZAudioPlayFileExample" keyEquivalent="h" id="134"/>
                             <menuItem title="Hide Others" keyEquivalent="h" id="145">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Show All" id="150">
-                                <connections>
-                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Show All" id="150"/>
                             <menuItem isSeparatorItem="YES" id="149">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Quit EZAudioPlayFileExample" keyEquivalent="q" id="136">
-                                <connections>
-                                    <action selector="terminate:" target="-3" id="449"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Quit EZAudioPlayFileExample" keyEquivalent="q" id="136"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="File" id="83">
                     <menu key="submenu" title="File" id="81">
                         <items>
-                            <menuItem title="New" keyEquivalent="n" id="82">
-                                <connections>
-                                    <action selector="newDocument:" target="-1" id="373"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Open…" keyEquivalent="o" id="72">
-                                <connections>
-                                    <action selector="openDocument:" target="-1" id="374"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="New" keyEquivalent="n" id="82"/>
+                            <menuItem title="Open…" keyEquivalent="o" id="72"/>
                             <menuItem title="Open Recent" id="124">
                                 <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
                                     <items>
-                                        <menuItem title="Clear Menu" id="126">
-                                            <connections>
-                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Clear Menu" id="126"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="79">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Close" keyEquivalent="w" id="73">
-                                <connections>
-                                    <action selector="performClose:" target="-1" id="193"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Save…" keyEquivalent="s" id="75">
-                                <connections>
-                                    <action selector="saveDocument:" target="-1" id="362"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73"/>
+                            <menuItem title="Save…" keyEquivalent="s" id="75"/>
                             <menuItem title="Revert to Saved" id="112">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="revertDocumentToSaved:" target="-1" id="364"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="74">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Page Setup..." keyEquivalent="P" id="77">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="runPageLayout:" target="-1" id="87"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Print…" keyEquivalent="p" id="78">
-                                <connections>
-                                    <action selector="print:" target="-1" id="86"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="78"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Edit" id="217">
                     <menu key="submenu" title="Edit" id="205">
                         <items>
-                            <menuItem title="Undo" keyEquivalent="z" id="207">
-                                <connections>
-                                    <action selector="undo:" target="-1" id="223"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Undo" keyEquivalent="z" id="207"/>
                             <menuItem title="Redo" keyEquivalent="Z" id="215">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="redo:" target="-1" id="231"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="206">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Cut" keyEquivalent="x" id="199">
-                                <connections>
-                                    <action selector="cut:" target="-1" id="228"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Copy" keyEquivalent="c" id="197">
-                                <connections>
-                                    <action selector="copy:" target="-1" id="224"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste" keyEquivalent="v" id="203">
-                                <connections>
-                                    <action selector="paste:" target="-1" id="226"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="199"/>
+                            <menuItem title="Copy" keyEquivalent="c" id="197"/>
+                            <menuItem title="Paste" keyEquivalent="v" id="203"/>
                             <menuItem title="Paste and Match Style" keyEquivalent="V" id="485">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="pasteAsPlainText:" target="-1" id="486"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Delete" id="202">
-                                <connections>
-                                    <action selector="delete:" target="-1" id="235"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="198">
-                                <connections>
-                                    <action selector="selectAll:" target="-1" id="232"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Delete" id="202"/>
+                            <menuItem title="Select All" keyEquivalent="a" id="198"/>
                             <menuItem isSeparatorItem="YES" id="214">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Find" id="218">
                                 <menu key="submenu" title="Find" id="220">
                                     <items>
-                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="241"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209"/>
                                         <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="534">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="535"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="487"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208"/>
                                         <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="213">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="488"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="489"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210">
-                                            <connections>
-                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221"/>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem title="Spelling and Grammar" id="216">
                                 <menu key="submenu" title="Spelling and Grammar" id="200">
                                     <items>
-                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204">
-                                            <connections>
-                                                <action selector="showGuessPanel:" target="-1" id="230"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201">
-                                            <connections>
-                                                <action selector="checkSpelling:" target="-1" id="225"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204"/>
+                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201"/>
                                         <menuItem isSeparatorItem="YES" id="453"/>
-                                        <menuItem title="Check Spelling While Typing" id="219">
-                                            <connections>
-                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="222"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Grammar With Spelling" id="346">
-                                            <connections>
-                                                <action selector="toggleGrammarChecking:" target="-1" id="347"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Check Spelling While Typing" id="219"/>
+                                        <menuItem title="Check Grammar With Spelling" id="346"/>
                                         <menuItem title="Correct Spelling Automatically" id="454">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="456"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -250,38 +214,18 @@
                                     <items>
                                         <menuItem title="Show Substitutions" id="457">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="458"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="459"/>
-                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350">
-                                            <connections>
-                                                <action selector="toggleSmartInsertDelete:" target="-1" id="355"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351">
-                                            <connections>
-                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="356"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350"/>
+                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351"/>
                                         <menuItem title="Smart Dashes" id="460">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="461"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Smart Links" tag="3" keyEquivalent="G" id="354">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="357"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Text Replacement" id="462">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="463"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -292,21 +236,12 @@
                                     <items>
                                         <menuItem title="Make Upper Case" id="452">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="uppercaseWord:" target="-1" id="464"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Make Lower Case" id="465">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="lowercaseWord:" target="-1" id="468"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Capitalize" id="466">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="capitalizeWord:" target="-1" id="467"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -314,16 +249,8 @@
                             <menuItem title="Speech" id="211">
                                 <menu key="submenu" title="Speech" id="212">
                                     <items>
-                                        <menuItem title="Start Speaking" id="196">
-                                            <connections>
-                                                <action selector="startSpeaking:" target="-1" id="233"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Stop Speaking" id="195">
-                                            <connections>
-                                                <action selector="stopSpeaking:" target="-1" id="227"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Start Speaking" id="196"/>
+                                        <menuItem title="Stop Speaking" id="195"/>
                                     </items>
                                 </menu>
                             </menuItem>
@@ -338,37 +265,13 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Font" systemMenu="font" id="388">
                                     <items>
-                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389">
-                                            <connections>
-                                                <action selector="orderFrontFontPanel:" target="420" id="424"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="421"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="422"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Underline" keyEquivalent="u" id="392">
-                                            <connections>
-                                                <action selector="underline:" target="-1" id="432"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389"/>
+                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390"/>
+                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391"/>
+                                        <menuItem title="Underline" keyEquivalent="u" id="392"/>
                                         <menuItem isSeparatorItem="YES" id="393"/>
-                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="425"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="423"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394"/>
+                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395"/>
                                         <menuItem isSeparatorItem="YES" id="396"/>
                                         <menuItem title="Kern" id="397">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -376,27 +279,15 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="416">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardKerning:" target="-1" id="438"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="417">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffKerning:" target="-1" id="441"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Tighten" id="418">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="tightenKerning:" target="-1" id="431"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Loosen" id="419">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="loosenKerning:" target="-1" id="435"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -407,21 +298,12 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="412">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardLigatures:" target="-1" id="439"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="413">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffLigatures:" target="-1" id="440"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use All" id="414">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useAllLigatures:" target="-1" id="434"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -432,55 +314,30 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="406">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="unscript:" target="-1" id="437"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Superscript" id="407">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="superscript:" target="-1" id="430"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Subscript" id="408">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="subscript:" target="-1" id="429"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Raise" id="409">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="raiseBaseline:" target="-1" id="426"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Lower" id="410">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="lowerBaseline:" target="-1" id="427"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="400"/>
-                                        <menuItem title="Show Colors" keyEquivalent="C" id="401">
-                                            <connections>
-                                                <action selector="orderFrontColorPanel:" target="-1" id="433"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Colors" keyEquivalent="C" id="401"/>
                                         <menuItem isSeparatorItem="YES" id="402"/>
                                         <menuItem title="Copy Style" keyEquivalent="c" id="403">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyFont:" target="-1" id="428"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Style" keyEquivalent="v" id="404">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteFont:" target="-1" id="436"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -489,27 +346,12 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Text" id="497">
                                     <items>
-                                        <menuItem title="Align Left" keyEquivalent="{" id="498">
-                                            <connections>
-                                                <action selector="alignLeft:" target="-1" id="524"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Center" keyEquivalent="|" id="499">
-                                            <connections>
-                                                <action selector="alignCenter:" target="-1" id="518"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Align Left" keyEquivalent="{" id="498"/>
+                                        <menuItem title="Center" keyEquivalent="|" id="499"/>
                                         <menuItem title="Justify" id="500">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="alignJustified:" target="-1" id="523"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Align Right" keyEquivalent="}" id="501">
-                                            <connections>
-                                                <action selector="alignRight:" target="-1" id="521"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Align Right" keyEquivalent="}" id="501"/>
                                         <menuItem isSeparatorItem="YES" id="502"/>
                                         <menuItem title="Writing Direction" id="503">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -521,23 +363,14 @@
                                                     <menuItem id="510">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionNatural:" target="-1" id="525"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="511">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="526"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="512">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="527"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem isSeparatorItem="YES" id="513"/>
                                                     <menuItem title="Selection" enabled="NO" id="514">
@@ -546,23 +379,14 @@
                                                     <menuItem id="515">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionNatural:" target="-1" id="528"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="516">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="529"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="517">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="530"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -570,21 +394,12 @@
                                         <menuItem isSeparatorItem="YES" id="504"/>
                                         <menuItem title="Show Ruler" id="505">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleRuler:" target="-1" id="520"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Copy Ruler" keyEquivalent="c" id="506">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyRuler:" target="-1" id="522"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Ruler" keyEquivalent="v" id="507">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteRuler:" target="-1" id="519"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -597,39 +412,20 @@
                         <items>
                             <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleToolbarShown:" target="-1" id="366"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Customize Toolbar…" id="298">
-                                <connections>
-                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="365"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Customize Toolbar…" id="298"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Window" id="19">
                     <menu key="submenu" title="Window" systemMenu="window" id="24">
                         <items>
-                            <menuItem title="Minimize" keyEquivalent="m" id="23">
-                                <connections>
-                                    <action selector="performMiniaturize:" target="-1" id="37"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Zoom" id="239">
-                                <connections>
-                                    <action selector="performZoom:" target="-1" id="240"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23"/>
+                            <menuItem title="Zoom" id="239"/>
                             <menuItem isSeparatorItem="YES" id="92">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Bring All to Front" id="5">
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="39"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5"/>
                         </items>
                     </menu>
                 </menuItem>
@@ -637,21 +433,17 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="491">
                         <items>
-                            <menuItem title="EZAudioPlayFileExample Help" keyEquivalent="?" id="492">
-                                <connections>
-                                    <action selector="showHelp:" target="-1" id="493"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="EZAudioPlayFileExample Help" keyEquivalent="?" id="492"/>
                         </items>
                     </menu>
                 </menuItem>
             </items>
         </menu>
         <window title="EZAudioPlayFileExample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <view key="contentView" id="372">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -662,6 +454,14 @@
                 <outlet property="window" destination="371" id="532"/>
             </connections>
         </customObject>
-        <customObject id="420" customClass="NSFontManager"/>
+        <customObject id="420" customClass="NSFontManager">
+            <connections>
+                <action selector="addFontTrait:" destination="390" id="421"/>
+                <action selector="addFontTrait:" destination="391" id="422"/>
+                <action selector="modifyFont:" destination="395" id="423"/>
+                <action selector="modifyFont:" destination="394" id="425"/>
+                <action selector="orderFrontFontPanel:" destination="389" id="424"/>
+            </connections>
+        </customObject>
     </objects>
 </document>

EZAudioExamples/OSX/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.h

@@ -36,19 +36,13 @@
 /**
  Using the EZOutputDataSource to provide output data to the EZOutput component. 
  */
-@interface PlayFileViewController : NSViewController <NSOpenSavePanelDelegate,
-                                                      EZAudioPlayerDelegate>
+@interface PlayFileViewController : NSViewController <NSOpenSavePanelDelegate,EZAudioFileDelegate,EZOutputDataSource>
 
 #pragma mark - Components
 /**
  The EZAudioFile representing of the currently selected audio file
  */
-@property (nonatomic, strong) EZAudioFile *audioFile;
-
-/**
- The EZOutput component used to output the audio file's audio data.
- */
-@property (nonatomic, strong) EZAudioPlayer *player;
+@property (nonatomic,strong) EZAudioFile *audioFile;
 
 /**
  The CoreGraphics based audio plot
@@ -61,72 +55,37 @@
  */
 @property (nonatomic, weak) IBOutlet NSTextField *filePathLabel;
 
-/**
- A checkbox button to that allows you to specify if the audio player should loop.
- */
-@property (nonatomic, weak) IBOutlet NSButton *loopCheckboxButton;
-
-/**
- A label to display the audio file's current position.
- */
-@property (nonatomic, weak) IBOutlet NSTextField *positionLabel;
-
 /**
  A slider to indicate the current frame position in the audio file
  */
-@property (nonatomic, weak) IBOutlet NSSlider *positionSlider;
+@property (nonatomic, weak) IBOutlet NSSlider *framePositionSlider;
 
 /**
- A label to display the value of the rolling history length of the audio plot.
+ A slider to adjust the sample rate.
  */
-@property (nonatomic, weak) IBOutlet NSTextField *rollingHistoryLengthLabel;
+@property (nonatomic, weak) IBOutlet NSSlider *sampleRateSlider;
 
 /**
- A slider to adjust the rolling history length of the audio plot.
+ A slider to adjust the sample rate.
  */
-@property (nonatomic, weak) IBOutlet NSSlider *rollingHistoryLengthSlider;
-
-/**
- A slider to adjust the volume.
- */
-@property (nonatomic, weak) IBOutlet NSSlider *volumeSlider;
-
-/**
- A label to display the volume of the audio plot.
- */
-@property (nonatomic, weak) IBOutlet NSTextField *volumeLabel;
+@property (nonatomic, weak) IBOutlet NSTextField *sampleRateLabel;
 
 /**
  A BOOL indicating whether or not we've reached the end of the file
  */
 @property (nonatomic,assign) BOOL eof;
 
-/**
- The microphone pop up button (contains the menu for choosing a microphone input)
- */
-@property (nonatomic, weak) IBOutlet NSPopUpButton *outputDevicePopUpButton;
-
 #pragma mark - Actions
+/**
+ Changes the sampling frequency on the output unit
+ */
+-(IBAction)changeOutputSamplingFrequency:(id)sender;
+
 /**
  Switches the plot drawing type between a buffer plot (visualizes the current stream of audio data from the update function) or a rolling plot (visualizes the audio data over time, this is the classic waveform look)
  */
 -(IBAction)changePlotType:(id)sender;
 
-/**
- Changes the length of the rolling history of the audio plot.
- */
-- (IBAction)changeRollingHistoryLength:(id)sender;
-
-/**
- Switches the loop state on the audio player regarding whether the current playing audio file should loop back to the beginning when it finishes.
- */
-- (IBAction)changeShouldLoop:(id)sender;
-
-/**
- Changes the volume of the audio coming out of the EZOutput.
- */
-- (IBAction)changeVolume:(id)sender;
-
 /**
  Prompts the file manager and loads in a new audio file into the EZAudioFile representation.
  */

EZAudioExamples/OSX/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.m

@@ -32,15 +32,6 @@
 
 @implementation PlayFileViewController
 
-//------------------------------------------------------------------------------
-#pragma mark - Dealloc
-//------------------------------------------------------------------------------
-
-- (void)dealloc
-{
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
 //------------------------------------------------------------------------------
 #pragma mark - Customize the Audio Plot
 //------------------------------------------------------------------------------
@@ -60,108 +51,17 @@
     self.audioPlot.shouldFill      = YES;
     // Mirror
     self.audioPlot.shouldMirror    = YES;
-    
-    //
-    // Create EZOutput to play audio data
-    //
-    self.player = [EZAudioPlayer audioPlayerWithDelegate:self];
-    self.player.shouldLoop = YES;
-    
-    //
-    // Reload the menu for the output device selector popup button
-    //
-    [self reloadOutputDevicePopUpButtonMenu];
-    
-    //
-    // Configure UI components
-    //
-    self.volumeSlider.floatValue = [self.player volume];
-    self.volumeLabel.floatValue = [self.player volume];
-    self.rollingHistoryLengthSlider.intValue = [self.audioPlot rollingHistoryLength];
-    self.rollingHistoryLengthLabel.intValue = [self.audioPlot rollingHistoryLength];
-    self.loopCheckboxButton.state = [self.player shouldLoop];
 
-    //
-    // Listen for state changes to the EZAudioPlayer
-    //
-    [self setupNotifications];
-    
     //
     // Try opening the sample file
     //
     [self openFileWithFilePathURL:[NSURL fileURLWithPath:kAudioFileDefault]];
 }
 
-//------------------------------------------------------------------------------
-#pragma mark - Notifications
-//------------------------------------------------------------------------------
-
-- (void)setupNotifications
-{
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(audioPlayerDidChangeAudioFile:)
-                                                 name:EZAudioPlayerDidChangeAudioFileNotification
-                                               object:self.player];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(audioPlayerDidChangeOutputDevice:)
-                                                 name:EZAudioPlayerDidChangeOutputDeviceNotification
-                                               object:self.player];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(audioPlayerDidChangePlayState:)
-                                                 name:EZAudioPlayerDidChangePlayStateNotification
-                                               object:self.player];
-    
-    // This notification will only trigger if the player's shouldLoop property is set to NO
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(audioPlayerDidReachEndOfFile:)
-                                                 name:EZAudioPlayerDidReachEndOfFileNotification
-                                               object:self.player];
-}
-
-//------------------------------------------------------------------------------
-
-- (void)audioPlayerDidChangeAudioFile:(NSNotification *)notification
-{
-    EZAudioPlayer *player = [notification object];
-    NSLog(@"Player changed audio file: %@", [player audioFile]);
-}
-
-//------------------------------------------------------------------------------
-
-- (void)audioPlayerDidChangeOutputDevice:(NSNotification *)notification
-{
-    EZAudioPlayer *player = [notification object];
-    NSLog(@"Player changed output device: %@", [player device]);
-}
-
-//------------------------------------------------------------------------------
-
-- (void)audioPlayerDidChangePlayState:(NSNotification *)notification
-{
-    EZAudioPlayer *player = [notification object];
-    NSLog(@"Player change play state, isPlaying: %i", [player isPlaying]);
-}
-
-//------------------------------------------------------------------------------
-
-- (void)audioPlayerDidReachEndOfFile:(NSNotification *)notification
-{
-    NSLog(@"Player did reach end of file!");
-    [self.playButton setState:NSOffState];
-}
-
 //------------------------------------------------------------------------------
 #pragma mark - Actions
 //------------------------------------------------------------------------------
 
-- (void)changedOutput:(NSMenuItem *)item
-{
-    EZAudioDevice *device = [item representedObject];
-    [self.player setDevice:device];
-}
-
-//------------------------------------------------------------------------------
-
 - (void)changePlotType:(id)sender
 {
     NSInteger selectedSegment = [sender selectedSegment];
@@ -180,28 +80,13 @@
 
 //------------------------------------------------------------------------------
 
-- (void)changeShouldLoop:(id)sender
+- (void)changeOutputSamplingFrequency:(id)sender
 {
-    NSInteger state = [(NSButton *)sender state];
-    [self.player setShouldLoop:state];
-}
-
-//------------------------------------------------------------------------------
-
-- (void)changeVolume:(id)sender
-{
-    float value = [(NSSlider *)sender floatValue];
-    [self.player setVolume:value];
-    self.volumeLabel.floatValue = value;
-}
-
-//------------------------------------------------------------------------------
-
-- (void)changeRollingHistoryLength:(id)sender
-{
-    float value = [(NSSlider *)sender floatValue];
-    self.audioPlot.rollingHistoryLength = (int)value;
-    self.rollingHistoryLengthLabel.floatValue = value;
+    float sampleRate = ((NSSlider *)sender).floatValue;
+    AudioStreamBasicDescription asbd = [[EZOutput sharedOutput] audioStreamBasicDescription];
+    asbd.mSampleRate = sampleRate;
+    [[EZOutput sharedOutput] setAudioStreamBasicDescription:asbd];
+    self.sampleRateLabel.floatValue = sampleRate;
 }
 
 //------------------------------------------------------------------------------
@@ -223,7 +108,7 @@
 
 -(void)play:(id)sender
 {
-    if (![self.player isPlaying])
+    if (![[EZOutput sharedOutput] isPlaying])
     {
         if (self.eof)
         {
@@ -233,11 +118,13 @@
         {
             self.audioPlot.plotType = EZPlotTypeRolling;
         }
-        [self.player play];
+        [EZOutput sharedOutput].outputDataSource = self;
+        [[EZOutput sharedOutput] startPlayback];
     }
     else
     {
-        [self.player pause];
+        [EZOutput sharedOutput].outputDataSource = nil;
+        [[EZOutput sharedOutput] stopPlayback];
     }
 }
 
@@ -245,9 +132,7 @@
 
 -(void)seekToFrame:(id)sender
 {
-    double value = [(NSSlider*)sender doubleValue];
-    [self.player seekToFrame:(SInt64)value];
-    self.positionLabel.doubleValue = value;
+    [self.audioFile seekToFrame:(SInt64)[(NSSlider*)sender doubleValue]];
 }
 
 //------------------------------------------------------------------------------
@@ -289,24 +174,27 @@
     //
     // Stop playback
     //
-    [self.player pause];
-    
-    //
-    // Clear the audio plot
-    //
-    [self.audioPlot clear];
+    [[EZOutput sharedOutput] stopPlayback];
   
     //
     // Load the audio file and customize the UI
     //
-    self.audioFile = [EZAudioFile audioFileWithURL:filePathURL];
-    self.eof = NO;
-    self.filePathLabel.stringValue = filePathURL.lastPathComponent;
-    self.positionSlider.minValue = 0.0f;
-    self.positionSlider.maxValue = (double)self.audioFile.totalFrames;
-    self.playButton.state = NSOffState;
+    self.audioFile                          = [EZAudioFile audioFileWithURL:filePathURL andDelegate:self];
+    self.eof                                = NO;
+    self.filePathLabel.stringValue          = filePathURL.lastPathComponent;
+    self.framePositionSlider.minValue       = 0.0f;
+    self.framePositionSlider.maxValue       = (double)self.audioFile.totalFrames;
+    self.playButton.state                   = NSOffState;
     self.plotSegmentControl.selectedSegment = 1;
 
+    //
+    // Set the client format from the EZAudioFile on the output
+    //
+    Float64 sampleRate = self.audioFile.clientFormat.mSampleRate;
+    self.sampleRateSlider.floatValue = sampleRate;
+    self.sampleRateLabel.floatValue = sampleRate;
+    [[EZOutput sharedOutput] setAudioStreamBasicDescription:[EZAudioUtilities stereoFloatInterleavedFormatWithSampleRate:44100]];
+
     //
     // Change back to a buffer plot, but mirror and fill the waveform
     //
@@ -318,89 +206,68 @@
     // Plot the whole waveform
     //
     __weak typeof (self) weakSelf = self;
-    [self.audioFile getWaveformDataWithNumberOfPoints:1024
-                                           completion:^(float **waveformData,
-                                                        int length)
+    [self.audioFile getWaveformDataWithCompletionBlock:^(float *waveformData,
+                                                         UInt32 length)
     {
-        [weakSelf.audioPlot updateBuffer:waveformData[0]
+        [weakSelf.audioPlot updateBuffer:waveformData
                           withBufferSize:length];
     }];
-    
-    //
-    // Play the audio file
-    //
-    [self.player setAudioFile:self.audioFile];
 }
 
 //------------------------------------------------------------------------------
-
-- (void)reloadOutputDevicePopUpButtonMenu
-{
-    NSArray *outputDevices = [EZAudioDevice outputDevices];
-    NSMenu *menu = [[NSMenu alloc] init];
-    NSMenuItem *defaultOutputDeviceItem;
-    for (EZAudioDevice *device in outputDevices)
-    {
-        NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:device.name
-                                                      action:@selector(changedOutput:)
-                                               keyEquivalent:@""];
-        item.representedObject = device;
-        item.target = self;
-        [menu addItem:item];
-        
-        // If this device is the same one the microphone is using then
-        // we will use this menu item as the currently selected item
-        // in the microphone input popup button's list of items. For instance,
-        // if you are connected to an external display by default the external
-        // display's microphone might be used instead of the mac's built in
-        // mic.
-        if ([device isEqual:[self.player device]])
-        {
-            defaultOutputDeviceItem = item;
-        }
-    }
-    self.outputDevicePopUpButton.menu = menu;
-    
-    //
-    // Set the selected device to the current selection on the
-    // microphone input popup button
-    //
-    [self.outputDevicePopUpButton selectItem:defaultOutputDeviceItem];
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlayerDelegate
+#pragma mark - EZAudioFileDelegate
 //------------------------------------------------------------------------------
 
-- (void)  audioPlayer:(EZAudioPlayer *)audioPlayer
-          playedAudio:(float **)buffer
+-(void)     audioFile:(EZAudioFile *)audioFile
+            readAudio:(float **)buffer
        withBufferSize:(UInt32)bufferSize
  withNumberOfChannels:(UInt32)numberOfChannels
-          inAudioFile:(EZAudioFile *)audioFile
 {
-    __weak typeof (self) weakSelf = self;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [weakSelf.audioPlot updateBuffer:buffer[0]
-                          withBufferSize:bufferSize];
-    });
+    if ([[EZOutput sharedOutput] isPlaying])
+    {
+        __weak typeof (self) weakSelf = self;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakSelf.audioPlot updateBuffer:buffer[0]
+                              withBufferSize:bufferSize];
+        });
+    }
 }
 
 //------------------------------------------------------------------------------
 
-- (void)audioPlayer:(EZAudioPlayer *)audioPlayer
-    updatedPosition:(SInt64)framePosition
-        inAudioFile:(EZAudioFile *)audioFile
-{
+-(void)audioFile:(EZAudioFile *)audioFile
+ updatedPosition:(SInt64)framePosition {
     __weak typeof (self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (!weakSelf.positionSlider.highlighted)
+        if (![weakSelf.framePositionSlider.cell isHighlighted])
         {
-            weakSelf.positionSlider.floatValue = (float)framePosition;
-            weakSelf.positionLabel.integerValue = framePosition;
+            weakSelf.framePositionSlider.floatValue = (float)framePosition;
         }
     });
 }
 
+//------------------------------------------------------------------------------
+#pragma mark - EZOutputDataSource
+//------------------------------------------------------------------------------
+
+-(void)             output:(EZOutput *)output
+ shouldFillAudioBufferList:(AudioBufferList *)audioBufferList
+        withNumberOfFrames:(UInt32)frames
+{
+    if (self.audioFile)
+    {
+        UInt32 bufferSize;
+        [self.audioFile readFrames:frames
+                   audioBufferList:audioBufferList
+                        bufferSize:&bufferSize
+                               eof:&_eof];
+        if (_eof)
+        {
+            [self seekToFrame:0];
+        }
+    }
+}
+
 //------------------------------------------------------------------------------
 #pragma mark - NSOpenSavePanelDelegate
 //------------------------------------------------------------------------------

EZAudioExamples/OSX/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.xib

@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="PlayFileViewController">
             <connections>
                 <outlet property="audioPlot" destination="Lz1-Gs-1lD" id="V5w-yH-ZVR"/>
-                <outlet property="checkboxButton" destination="5xb-MK-C8b" id="fx2-y9-qXH"/>
                 <outlet property="filePathLabel" destination="0eT-7c-7fJ" id="IGv-mA-5Hw"/>
-                <outlet property="loopCheckboxButton" destination="5xb-MK-C8b" id="Rlt-Z9-Zy8"/>
-                <outlet property="outputDevicePopUpButton" destination="0LV-Bi-dGz" id="QTQ-qq-Ro8"/>
+                <outlet property="framePositionSlider" destination="CFP-v0-TzQ" id="3oy-Xn-4JK"/>
                 <outlet property="playButton" destination="OQp-Lr-dlS" id="K5R-Qg-7DY"/>
                 <outlet property="plotSegmentControl" destination="bZW-tA-C61" id="4ic-Ou-qh2"/>
-                <outlet property="positionLabel" destination="KYm-Io-VNv" id="Fhs-Ya-szS"/>
-                <outlet property="positionSlider" destination="CFP-v0-TzQ" id="EGD-qT-48R"/>
-                <outlet property="rollingHistoryLengthLabel" destination="vKe-ey-hXI" id="UiN-5S-TOn"/>
-                <outlet property="rollingHistoryLengthSlider" destination="vj5-qT-JkR" id="sEj-iE-yTV"/>
+                <outlet property="sampleRateLabel" destination="3ul-3w-l3S" id="5CA-Au-tFa"/>
+                <outlet property="sampleRateSlider" destination="rRH-oS-VV3" id="8ij-Ff-CZK"/>
                 <outlet property="view" destination="Xpo-HP-Ost" id="zlj-bW-4iz"/>
-                <outlet property="volumeLabel" destination="3ul-3w-l3S" id="sXM-mC-tN0"/>
-                <outlet property="volumeSlider" destination="rRH-oS-VV3" id="kql-X5-amB"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
@@ -30,249 +24,112 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="Lz1-Gs-1lD" customClass="EZAudioPlotGL">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="366"/>
-                    <subviews>
-                        <box autoresizesSubviews="NO" title="Box" boxType="custom" borderType="none" translatesAutoresizingMaskIntoConstraints="NO" id="woe-PM-Kco">
-                            <rect key="frame" x="0.0" y="124" width="480" height="242"/>
-                            <view key="contentView">
-                                <rect key="frame" x="0.0" y="0.0" width="480" height="242"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Ma-jj-U3z">
-                                        <rect key="frame" x="12" y="172" width="125" height="32"/>
-                                        <buttonCell key="cell" type="push" title="Choose File..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="KLq-bf-Xkh">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="openFile:" target="-2" id="3QB-hU-LDl"/>
-                                        </connections>
-                                    </button>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0eT-7c-7fJ">
-                                        <rect key="frame" x="140" y="184" width="36" height="16"/>
-                                        <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" alignment="left" title="Label" id="vXQ-HF-vLX">
-                                            <font key="font" metaFont="cellTitle"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OQp-Lr-dlS">
-                                        <rect key="frame" x="12" y="139" width="125" height="32"/>
-                                        <buttonCell key="cell" type="push" title="Play" alternateTitle="Pause" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Z2A-7U-sb6">
-                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="play:" target="-2" id="y83-JF-y4e"/>
-                                        </connections>
-                                    </button>
-                                    <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bZW-tA-C61">
-                                        <rect key="frame" x="335" y="144" width="129" height="24"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="125" id="MeF-BC-3tU"/>
-                                        </constraints>
-                                        <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="8U1-ER-vPJ">
-                                            <font key="font" metaFont="system"/>
-                                            <segments>
-                                                <segment label="Buffer" selected="YES"/>
-                                                <segment label="Rolling" tag="1"/>
-                                            </segments>
-                                        </segmentedCell>
-                                        <connections>
-                                            <action selector="changePlotType:" target="-2" id="alU-Rf-22L"/>
-                                        </connections>
-                                    </segmentedControl>
-                                    <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CFP-v0-TzQ">
-                                        <rect key="frame" x="117" y="94" width="269" height="20"/>
-                                        <sliderCell key="cell" continuous="YES" alignment="left" maxValue="100" doubleValue="9.3380614657210401" tickMarkPosition="above" sliderType="linear" id="gPc-pN-dmP"/>
-                                        <connections>
-                                            <action selector="seekToFrame:" target="-2" id="iVY-so-6X2"/>
-                                        </connections>
-                                    </slider>
-                                    <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vj5-qT-JkR">
-                                        <rect key="frame" x="117" y="69" width="269" height="20"/>
-                                        <sliderCell key="cell" continuous="YES" alignment="left" minValue="128" maxValue="1024" doubleValue="128" tickMarkPosition="above" sliderType="linear" id="uRZ-Kf-cgJ"/>
-                                        <connections>
-                                            <action selector="changeRollingHistoryLength:" target="-2" id="eYD-H1-n52"/>
-                                        </connections>
-                                    </slider>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7AB-VA-xL3">
-                                        <rect key="frame" x="16" y="121" width="53" height="16"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Volume:" id="GAa-Hp-OlV">
-                                            <font key="font" metaFont="systemBold" size="12"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Fw5-pm-4w0">
-                                        <rect key="frame" x="16" y="96" width="58" height="16"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Position:" id="9hW-4Z-OEW">
-                                            <font key="font" metaFont="systemBold" size="12"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aa9-nc-WHJ">
-                                        <rect key="frame" x="16" y="71" width="96" height="16"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Rolling Length:" id="Mfs-zu-sCx">
-                                            <font key="font" metaFont="systemBold" size="12"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3ul-3w-l3S">
-                                        <rect key="frame" x="390" y="121" width="72" height="16"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="68" id="H4m-6Q-Jin"/>
-                                        </constraints>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="0.00" id="vlK-Hb-Yca">
-                                            <numberFormatter key="formatter" formatterBehavior="custom10_4" minimumIntegerDigits="1" maximumIntegerDigits="1" minimumFractionDigits="2" maximumFractionDigits="2" id="bBU-vS-tEB">
-                                                <metadata>
-                                                    <real key="inspectorSampleValue" value="44"/>
-                                                </metadata>
-                                            </numberFormatter>
-                                            <font key="font" metaFont="cellTitle"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rRH-oS-VV3">
-                                        <rect key="frame" x="117" y="119" width="269" height="20"/>
-                                        <sliderCell key="cell" continuous="YES" state="on" alignment="left" maxValue="1" doubleValue="0.5" tickMarkPosition="above" sliderType="linear" id="xbX-Ce-da5"/>
-                                        <connections>
-                                            <action selector="changeVolume:" target="-2" id="iKx-7d-34D"/>
-                                        </connections>
-                                    </slider>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vKe-ey-hXI">
-                                        <rect key="frame" x="390" y="71" width="72" height="16"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="0" id="JiA-3H-vb2">
-                                            <numberFormatter key="formatter" formatterBehavior="custom10_4" minimumIntegerDigits="0" maximumIntegerDigits="42" id="AYM-Tu-k5w">
-                                                <metadata>
-                                                    <real key="inspectorSampleValue" value="44"/>
-                                                </metadata>
-                                            </numberFormatter>
-                                            <font key="font" metaFont="cellTitle"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0LV-Bi-dGz" userLabel="microphoneInputPopUpButton">
-                                        <rect key="frame" x="16" y="13" width="180" height="26"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="175" id="2C5-hq-caw"/>
-                                        </constraints>
-                                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="a7m-V2-Mw8" id="VLU-oW-zia">
-                                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="menu"/>
-                                            <menu key="menu" id="uLv-18-vra">
-                                                <items>
-                                                    <menuItem title="Item 1" state="on" id="a7m-V2-Mw8"/>
-                                                    <menuItem title="Item 2" id="qJe-zH-SrZ"/>
-                                                    <menuItem title="Item 3" id="zlE-dQ-R4x"/>
-                                                </items>
-                                            </menu>
-                                        </popUpButtonCell>
-                                    </popUpButton>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RRH-G6-xkQ">
-                                        <rect key="frame" x="16" y="46" width="50" height="16"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Output:" id="2OQ-1o-1vp">
-                                            <font key="font" metaFont="systemBold" size="12"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KYm-Io-VNv">
-                                        <rect key="frame" x="390" y="96" width="72" height="16"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="0" id="gfS-wb-pFu">
-                                            <numberFormatter key="formatter" formatterBehavior="custom10_4" minimumIntegerDigits="0" maximumIntegerDigits="42" id="py5-BY-fQN">
-                                                <metadata>
-                                                    <real key="inspectorSampleValue" value="44"/>
-                                                </metadata>
-                                            </numberFormatter>
-                                            <font key="font" metaFont="cellTitle"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="5xb-MK-C8b">
-                                        <rect key="frame" x="442" y="14" width="22" height="18"/>
-                                        <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="right" alignment="right" state="on" inset="2" id="O83-sN-k0z">
-                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="changeShouldLoop:" target="-2" id="lJN-Pe-JWA"/>
-                                        </connections>
-                                    </button>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TPR-Ta-wlb">
-                                        <rect key="frame" x="407" y="16" width="35" height="16"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Loop" id="Tok-s1-Gjv">
-                                            <font key="font" metaFont="systemBold" size="12"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                </subviews>
-                            </view>
-                            <constraints>
-                                <constraint firstItem="2Ma-jj-U3z" firstAttribute="leading" secondItem="OQp-Lr-dlS" secondAttribute="leading" id="65r-3l-UpC"/>
-                                <constraint firstItem="bZW-tA-C61" firstAttribute="top" secondItem="OQp-Lr-dlS" secondAttribute="top" id="68U-wj-F2c"/>
-                                <constraint firstItem="vKe-ey-hXI" firstAttribute="trailing" secondItem="KYm-Io-VNv" secondAttribute="trailing" id="6r9-KH-IXj"/>
-                                <constraint firstItem="RRH-G6-xkQ" firstAttribute="top" secondItem="Aa9-nc-WHJ" secondAttribute="bottom" constant="9" id="ARD-0e-VM7"/>
-                                <constraint firstItem="rRH-oS-VV3" firstAttribute="baseline" secondItem="7AB-VA-xL3" secondAttribute="baseline" id="ASG-bU-1Vn"/>
-                                <constraint firstItem="KYm-Io-VNv" firstAttribute="leading" secondItem="CFP-v0-TzQ" secondAttribute="trailing" constant="8" symbolic="YES" id="CvB-yq-Kw5"/>
-                                <constraint firstAttribute="trailing" secondItem="bZW-tA-C61" secondAttribute="trailing" constant="18" id="DqD-RM-NfD"/>
-                                <constraint firstItem="0LV-Bi-dGz" firstAttribute="bottom" secondItem="5xb-MK-C8b" secondAttribute="bottom" id="Eo3-Ds-Pga"/>
-                                <constraint firstItem="7AB-VA-xL3" firstAttribute="leading" secondItem="Fw5-pm-4w0" secondAttribute="leading" id="F4w-hP-VrP"/>
-                                <constraint firstItem="vj5-qT-JkR" firstAttribute="baseline" secondItem="Aa9-nc-WHJ" secondAttribute="baseline" id="FyT-aB-ZMd"/>
-                                <constraint firstItem="Fw5-pm-4w0" firstAttribute="top" secondItem="7AB-VA-xL3" secondAttribute="bottom" constant="9" id="HHI-Px-CUW"/>
-                                <constraint firstItem="RRH-G6-xkQ" firstAttribute="leading" secondItem="0LV-Bi-dGz" secondAttribute="leading" id="Hpy-j7-Sn4"/>
-                                <constraint firstItem="0eT-7c-7fJ" firstAttribute="leading" secondItem="2Ma-jj-U3z" secondAttribute="trailing" constant="11" id="I84-HZ-kvK"/>
-                                <constraint firstItem="OQp-Lr-dlS" firstAttribute="trailing" secondItem="2Ma-jj-U3z" secondAttribute="trailing" id="JSU-sV-ydn"/>
-                                <constraint firstAttribute="bottom" secondItem="TPR-Ta-wlb" secondAttribute="bottom" constant="16" id="NHb-lI-raQ"/>
-                                <constraint firstItem="5xb-MK-C8b" firstAttribute="leading" secondItem="TPR-Ta-wlb" secondAttribute="trailing" constant="4" id="OcY-La-p2F"/>
-                                <constraint firstAttribute="bottom" secondItem="0LV-Bi-dGz" secondAttribute="bottom" constant="16" id="Su4-hr-dIF"/>
-                                <constraint firstItem="7AB-VA-xL3" firstAttribute="top" secondItem="OQp-Lr-dlS" secondAttribute="bottom" constant="9" id="U54-Sp-UR9"/>
-                                <constraint firstItem="KYm-Io-VNv" firstAttribute="baseline" secondItem="CFP-v0-TzQ" secondAttribute="baseline" id="WYP-6b-bar"/>
-                                <constraint firstItem="KYm-Io-VNv" firstAttribute="leading" secondItem="vKe-ey-hXI" secondAttribute="leading" id="WkB-Br-hx8"/>
-                                <constraint firstItem="CFP-v0-TzQ" firstAttribute="leading" secondItem="rRH-oS-VV3" secondAttribute="leading" id="YYb-HP-3oI"/>
-                                <constraint firstItem="0LV-Bi-dGz" firstAttribute="top" secondItem="RRH-G6-xkQ" secondAttribute="bottom" constant="9" id="ZW9-Wz-NjB"/>
-                                <constraint firstItem="bZW-tA-C61" firstAttribute="trailing" secondItem="5xb-MK-C8b" secondAttribute="trailing" id="a4v-Da-5OI"/>
-                                <constraint firstItem="vj5-qT-JkR" firstAttribute="leading" secondItem="Aa9-nc-WHJ" secondAttribute="trailing" constant="9" id="bJy-fK-Mgx"/>
-                                <constraint firstItem="rRH-oS-VV3" firstAttribute="baseline" secondItem="3ul-3w-l3S" secondAttribute="baseline" id="bfM-wb-rHx"/>
-                                <constraint firstItem="7AB-VA-xL3" firstAttribute="leading" secondItem="OQp-Lr-dlS" secondAttribute="leading" id="dta-hH-v59"/>
-                                <constraint firstItem="Fw5-pm-4w0" firstAttribute="leading" secondItem="Aa9-nc-WHJ" secondAttribute="leading" id="e3o-sk-vrf"/>
-                                <constraint firstItem="KYm-Io-VNv" firstAttribute="trailing" secondItem="3ul-3w-l3S" secondAttribute="trailing" id="eZB-I6-kCg"/>
-                                <constraint firstAttribute="height" constant="242" id="gIM-zm-GWO"/>
-                                <constraint firstItem="2Ma-jj-U3z" firstAttribute="top" secondItem="0eT-7c-7fJ" secondAttribute="top" id="hRy-MT-4On"/>
-                                <constraint firstItem="OQp-Lr-dlS" firstAttribute="top" secondItem="2Ma-jj-U3z" secondAttribute="bottom" constant="12" symbolic="YES" id="i9A-k5-5Qa"/>
-                                <constraint firstItem="3ul-3w-l3S" firstAttribute="leading" secondItem="KYm-Io-VNv" secondAttribute="leading" id="jNp-BV-Sn1"/>
-                                <constraint firstItem="CFP-v0-TzQ" firstAttribute="leading" secondItem="vj5-qT-JkR" secondAttribute="leading" id="jlK-cp-ukV"/>
-                                <constraint firstAttribute="trailing" secondItem="3ul-3w-l3S" secondAttribute="trailing" constant="20" id="lUf-2h-95p"/>
-                                <constraint firstItem="CFP-v0-TzQ" firstAttribute="baseline" secondItem="Fw5-pm-4w0" secondAttribute="baseline" id="lVm-7v-XFC"/>
-                                <constraint firstItem="Aa9-nc-WHJ" firstAttribute="top" secondItem="Fw5-pm-4w0" secondAttribute="bottom" constant="9" id="mep-8V-ybk"/>
-                                <constraint firstItem="2Ma-jj-U3z" firstAttribute="leading" secondItem="woe-PM-Kco" secondAttribute="leading" constant="18" id="ufW-Fo-f6i"/>
-                                <constraint firstItem="RRH-G6-xkQ" firstAttribute="leading" secondItem="Aa9-nc-WHJ" secondAttribute="leading" id="v6o-ED-CBK"/>
-                                <constraint firstItem="vKe-ey-hXI" firstAttribute="leading" secondItem="vj5-qT-JkR" secondAttribute="trailing" constant="8" symbolic="YES" id="x5P-WA-MWS"/>
-                                <constraint firstItem="3ul-3w-l3S" firstAttribute="leading" secondItem="rRH-oS-VV3" secondAttribute="trailing" constant="8" symbolic="YES" id="yQv-xx-Toh"/>
-                                <constraint firstItem="vj5-qT-JkR" firstAttribute="baseline" secondItem="vKe-ey-hXI" secondAttribute="baseline" id="ysL-Tn-bng"/>
-                            </constraints>
-                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                            <color key="fillColor" red="0.0" green="0.0" blue="0.0" alpha="0.70000000000000007" colorSpace="calibratedRGB"/>
-                        </box>
-                    </subviews>
-                    <constraints>
-                        <constraint firstAttribute="trailing" secondItem="woe-PM-Kco" secondAttribute="trailing" id="IfY-Ff-46n"/>
-                        <constraint firstItem="woe-PM-Kco" firstAttribute="leading" secondItem="Lz1-Gs-1lD" secondAttribute="leading" id="UzR-Mq-ujC"/>
-                        <constraint firstItem="woe-PM-Kco" firstAttribute="top" secondItem="Lz1-Gs-1lD" secondAttribute="top" id="yqN-Hf-0Wn"/>
-                    </constraints>
+                    <rect key="frame" x="0.0" y="0.0" width="480" height="236"/>
                 </customView>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Ma-jj-U3z">
+                    <rect key="frame" x="12" y="320" width="125" height="32"/>
+                    <buttonCell key="cell" type="push" title="Choose File..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="KLq-bf-Xkh">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="openFile:" target="-2" id="3QB-hU-LDl"/>
+                    </connections>
+                </button>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0eT-7c-7fJ">
+                    <rect key="frame" x="140" y="332" width="36" height="16"/>
+                    <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" alignment="left" title="Label" id="vXQ-HF-vLX">
+                        <font key="font" metaFont="cellTitle"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OQp-Lr-dlS">
+                    <rect key="frame" x="12" y="287" width="125" height="32"/>
+                    <buttonCell key="cell" type="push" title="Play" alternateTitle="Pause" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Z2A-7U-sb6">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="play:" target="-2" id="y83-JF-y4e"/>
+                    </connections>
+                </button>
+                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bZW-tA-C61">
+                    <rect key="frame" x="335" y="292" width="129" height="24"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="125" id="Xbc-hw-M9K"/>
+                    </constraints>
+                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="8U1-ER-vPJ">
+                        <font key="font" metaFont="system"/>
+                        <segments>
+                            <segment label="Buffer" selected="YES"/>
+                            <segment label="Rolling" tag="1"/>
+                        </segments>
+                    </segmentedCell>
+                    <connections>
+                        <action selector="changePlotType:" target="-2" id="alU-Rf-22L"/>
+                    </connections>
+                </segmentedControl>
+                <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CFP-v0-TzQ">
+                    <rect key="frame" x="16" y="242" width="448" height="20"/>
+                    <sliderCell key="cell" alignment="left" maxValue="100" doubleValue="9.3380614657210401" tickMarkPosition="above" sliderType="linear" id="gPc-pN-dmP"/>
+                    <connections>
+                        <action selector="seekToFrame:" target="-2" id="iVY-so-6X2"/>
+                    </connections>
+                </slider>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7AB-VA-xL3">
+                    <rect key="frame" x="16" y="269" width="85" height="16"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Sample Rate:" id="GAa-Hp-OlV">
+                        <font key="font" metaFont="systemBold" size="12"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3ul-3w-l3S">
+                    <rect key="frame" x="413" y="269" width="51" height="16"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="44100.0" id="vlK-Hb-Yca">
+                        <numberFormatter key="formatter" formatterBehavior="custom10_4" minimumIntegerDigits="0" maximumIntegerDigits="42" id="bBU-vS-tEB">
+                            <metadata>
+                                <real key="inspectorSampleValue" value="44"/>
+                            </metadata>
+                        </numberFormatter>
+                        <font key="font" metaFont="titleBar" size="12"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rRH-oS-VV3">
+                    <rect key="frame" x="106" y="267" width="302" height="20"/>
+                    <sliderCell key="cell" state="on" alignment="left" minValue="8000" maxValue="88200" doubleValue="44100" tickMarkPosition="above" sliderType="linear" id="xbX-Ce-da5"/>
+                    <connections>
+                        <action selector="changeOutputSamplingFrequency:" target="-2" id="yWM-Ei-ztA"/>
+                    </connections>
+                </slider>
             </subviews>
             <constraints>
-                <constraint firstItem="Lz1-Gs-1lD" firstAttribute="leading" secondItem="Xpo-HP-Ost" secondAttribute="leading" id="Edu-Ye-wV8"/>
-                <constraint firstAttribute="bottom" secondItem="Lz1-Gs-1lD" secondAttribute="bottom" id="UV6-Xh-8m0"/>
-                <constraint firstItem="Lz1-Gs-1lD" firstAttribute="top" secondItem="Xpo-HP-Ost" secondAttribute="top" id="b4I-Py-1Kt"/>
-                <constraint firstAttribute="trailing" secondItem="Lz1-Gs-1lD" secondAttribute="trailing" id="ges-aT-5L1"/>
+                <constraint firstAttribute="trailing" secondItem="Lz1-Gs-1lD" secondAttribute="trailing" id="6ch-Ea-Fiv"/>
+                <constraint firstItem="OQp-Lr-dlS" firstAttribute="top" secondItem="bZW-tA-C61" secondAttribute="top" id="7vO-GR-xTE"/>
+                <constraint firstItem="0eT-7c-7fJ" firstAttribute="top" secondItem="2Ma-jj-U3z" secondAttribute="top" id="HBU-T5-zaa"/>
+                <constraint firstItem="7AB-VA-xL3" firstAttribute="baseline" secondItem="rRH-oS-VV3" secondAttribute="baseline" id="Kam-ih-ZXi"/>
+                <constraint firstItem="bZW-tA-C61" firstAttribute="trailing" secondItem="3ul-3w-l3S" secondAttribute="trailing" id="LD2-vK-71Z"/>
+                <constraint firstItem="CFP-v0-TzQ" firstAttribute="top" secondItem="7AB-VA-xL3" secondAttribute="bottom" constant="9" id="LD8-VL-CNM"/>
+                <constraint firstItem="OQp-Lr-dlS" firstAttribute="trailing" secondItem="2Ma-jj-U3z" secondAttribute="trailing" id="MsA-yL-lz2"/>
+                <constraint firstItem="7AB-VA-xL3" firstAttribute="top" secondItem="OQp-Lr-dlS" secondAttribute="bottom" constant="9" id="Pih-ij-B0m"/>
+                <constraint firstItem="7AB-VA-xL3" firstAttribute="leading" secondItem="CFP-v0-TzQ" secondAttribute="leading" id="RYx-Xq-XLZ"/>
+                <constraint firstItem="2Ma-jj-U3z" firstAttribute="leading" secondItem="Xpo-HP-Ost" secondAttribute="leading" constant="18" id="S8x-eP-qXK"/>
+                <constraint firstItem="0eT-7c-7fJ" firstAttribute="leading" secondItem="2Ma-jj-U3z" secondAttribute="trailing" constant="11" id="TQU-4h-fbE"/>
+                <constraint firstItem="Lz1-Gs-1lD" firstAttribute="leading" secondItem="Xpo-HP-Ost" secondAttribute="leading" id="Uez-MB-poN"/>
+                <constraint firstItem="2Ma-jj-U3z" firstAttribute="top" secondItem="Xpo-HP-Ost" secondAttribute="top" constant="18" id="WBN-LT-MZa"/>
+                <constraint firstItem="CFP-v0-TzQ" firstAttribute="centerX" secondItem="Lz1-Gs-1lD" secondAttribute="centerX" id="WbD-eb-ZrO"/>
+                <constraint firstItem="OQp-Lr-dlS" firstAttribute="leading" secondItem="7AB-VA-xL3" secondAttribute="leading" id="Xfe-yK-p7E"/>
+                <constraint firstItem="3ul-3w-l3S" firstAttribute="baseline" secondItem="rRH-oS-VV3" secondAttribute="baseline" id="Xmx-y3-yLf"/>
+                <constraint firstItem="OQp-Lr-dlS" firstAttribute="leading" secondItem="2Ma-jj-U3z" secondAttribute="leading" id="ZFJ-Sy-xrR"/>
+                <constraint firstItem="3ul-3w-l3S" firstAttribute="leading" secondItem="rRH-oS-VV3" secondAttribute="trailing" constant="9" id="id3-zN-WXi"/>
+                <constraint firstItem="Lz1-Gs-1lD" firstAttribute="top" secondItem="CFP-v0-TzQ" secondAttribute="bottom" constant="8" symbolic="YES" id="ku7-ZF-joD"/>
+                <constraint firstItem="OQp-Lr-dlS" firstAttribute="top" secondItem="2Ma-jj-U3z" secondAttribute="bottom" constant="12" symbolic="YES" id="kzD-5K-Jb3"/>
+                <constraint firstItem="rRH-oS-VV3" firstAttribute="leading" secondItem="7AB-VA-xL3" secondAttribute="trailing" constant="9" id="nVe-ua-Zpl"/>
+                <constraint firstItem="3ul-3w-l3S" firstAttribute="trailing" secondItem="CFP-v0-TzQ" secondAttribute="trailing" id="pPp-hF-DB3"/>
+                <constraint firstAttribute="bottom" secondItem="Lz1-Gs-1lD" secondAttribute="bottom" id="yaV-0k-IXf"/>
             </constraints>
             <point key="canvasLocation" x="191" y="409"/>
         </customView>

EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample.xcodeproj/project.pbxproj

@@ -7,23 +7,24 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		66755ADC1B3B79230013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AB91B3B79220013E67E /* EZAudio.m */; };
-		66755ADD1B3B79230013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755ABB1B3B79220013E67E /* EZAudioDevice.m */; };
-		66755ADE1B3B79230013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755ABD1B3B79220013E67E /* EZAudioDisplayLink.m */; };
-		66755ADF1B3B79230013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755ABF1B3B79220013E67E /* EZAudioFile.m */; };
-		66755AE01B3B79230013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AC11B3B79220013E67E /* EZAudioFloatConverter.m */; };
-		66755AE11B3B79230013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AC31B3B79220013E67E /* EZAudioFloatData.m */; };
-		66755AE21B3B79230013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AC51B3B79220013E67E /* EZAudioPlayer.m */; };
-		66755AE31B3B79230013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AC71B3B79220013E67E /* EZAudioPlot.m */; };
-		66755AE41B3B79230013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AC91B3B79220013E67E /* EZAudioPlotGL.m */; };
-		66755AE61B3B79230013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755ACD1B3B79220013E67E /* EZAudioUtilities.m */; };
-		66755AE71B3B79230013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755ACF1B3B79230013E67E /* EZMicrophone.m */; };
-		66755AE81B3B79230013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AD11B3B79230013E67E /* EZOutput.m */; };
-		66755AE91B3B79230013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AD31B3B79230013E67E /* EZPlot.m */; };
-		66755AEA1B3B79230013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AD51B3B79230013E67E /* EZRecorder.m */; };
-		66755AEB1B3B79230013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 66755AD61B3B79230013E67E /* TPCircularBuffer.c */; };
-		66755AEC1B3B79230013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 66755AD91B3B79230013E67E /* CHANGELOG */; };
-		66755AED1B3B79230013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 66755ADA1B3B79230013E67E /* VERSION */; };
+		665957C01B38B356003E97A1 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6659579E1B38B356003E97A1 /* AEFloatConverter.m */; };
+		665957C11B38B356003E97A1 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957A01B38B356003E97A1 /* EZAudio.m */; };
+		665957C21B38B356003E97A1 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957A21B38B356003E97A1 /* EZAudioDevice.m */; };
+		665957C31B38B356003E97A1 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957A41B38B356003E97A1 /* EZAudioFile.m */; };
+		665957C41B38B356003E97A1 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957A61B38B356003E97A1 /* EZAudioFloatConverter.m */; };
+		665957C51B38B356003E97A1 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957A81B38B356003E97A1 /* EZAudioFloatData.m */; };
+		665957C61B38B356003E97A1 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957AA1B38B356003E97A1 /* EZAudioPlayer.m */; };
+		665957C71B38B356003E97A1 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957AC1B38B356003E97A1 /* EZAudioPlot.m */; };
+		665957C81B38B356003E97A1 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957AE1B38B356003E97A1 /* EZAudioPlotGL.m */; };
+		665957C91B38B356003E97A1 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957B01B38B356003E97A1 /* EZAudioPlotGLKViewController.m */; };
+		665957CA1B38B356003E97A1 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957B21B38B356003E97A1 /* EZAudioUtilities.m */; };
+		665957CB1B38B356003E97A1 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957B41B38B356003E97A1 /* EZMicrophone.m */; };
+		665957CC1B38B356003E97A1 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957B61B38B356003E97A1 /* EZOutput.m */; };
+		665957CD1B38B356003E97A1 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957B81B38B356003E97A1 /* EZPlot.m */; };
+		665957CE1B38B356003E97A1 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 665957BA1B38B356003E97A1 /* EZRecorder.m */; };
+		665957CF1B38B356003E97A1 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 665957BB1B38B356003E97A1 /* TPCircularBuffer.c */; };
+		665957D01B38B356003E97A1 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 665957BE1B38B356003E97A1 /* CHANGELOG */; };
+		665957D11B38B356003E97A1 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 665957BF1B38B356003E97A1 /* VERSION */; };
 		94056E0D185BB3D800EB94BA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94056E0C185BB3D800EB94BA /* Cocoa.framework */; };
 		94056E17185BB3D800EB94BA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 94056E15185BB3D800EB94BA /* InfoPlist.strings */; };
 		94056E19185BB3D800EB94BA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 94056E18185BB3D800EB94BA /* main.m */; };
@@ -57,38 +58,40 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		66755AB81B3B79220013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		66755AB91B3B79220013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		66755ABA1B3B79220013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		66755ABB1B3B79220013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		66755ABC1B3B79220013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		66755ABD1B3B79220013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		66755ABE1B3B79220013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		66755ABF1B3B79220013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		66755AC01B3B79220013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		66755AC11B3B79220013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		66755AC21B3B79220013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		66755AC31B3B79220013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		66755AC41B3B79220013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		66755AC51B3B79220013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		66755AC61B3B79220013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		66755AC71B3B79220013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		66755AC81B3B79220013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		66755AC91B3B79220013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		66755ACC1B3B79220013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		66755ACD1B3B79220013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		66755ACE1B3B79230013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		66755ACF1B3B79230013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		66755AD01B3B79230013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		66755AD11B3B79230013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		66755AD21B3B79230013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		66755AD31B3B79230013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		66755AD41B3B79230013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		66755AD51B3B79230013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		66755AD61B3B79230013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		66755AD71B3B79230013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		66755AD91B3B79230013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		66755ADA1B3B79230013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6659579D1B38B356003E97A1 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		6659579E1B38B356003E97A1 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		6659579F1B38B356003E97A1 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		665957A01B38B356003E97A1 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		665957A11B38B356003E97A1 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		665957A21B38B356003E97A1 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		665957A31B38B356003E97A1 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		665957A41B38B356003E97A1 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		665957A51B38B356003E97A1 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		665957A61B38B356003E97A1 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		665957A71B38B356003E97A1 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		665957A81B38B356003E97A1 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		665957A91B38B356003E97A1 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		665957AA1B38B356003E97A1 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		665957AB1B38B356003E97A1 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		665957AC1B38B356003E97A1 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		665957AD1B38B356003E97A1 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		665957AE1B38B356003E97A1 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		665957AF1B38B356003E97A1 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		665957B01B38B356003E97A1 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		665957B11B38B356003E97A1 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		665957B21B38B356003E97A1 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		665957B31B38B356003E97A1 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		665957B41B38B356003E97A1 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		665957B51B38B356003E97A1 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		665957B61B38B356003E97A1 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		665957B71B38B356003E97A1 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		665957B81B38B356003E97A1 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		665957B91B38B356003E97A1 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		665957BA1B38B356003E97A1 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		665957BB1B38B356003E97A1 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		665957BC1B38B356003E97A1 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		665957BE1B38B356003E97A1 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		665957BF1B38B356003E97A1 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		94056E09185BB3D800EB94BA /* EZAudioRecordExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioRecordExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		94056E0C185BB3D800EB94BA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		94056E0F185BB3D800EB94BA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -148,50 +151,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		66755AB51B3B79220013E67E /* EZAudio */ = {
+		6659579C1B38B356003E97A1 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				66755AB81B3B79220013E67E /* EZAudio.h */,
-				66755AB91B3B79220013E67E /* EZAudio.m */,
-				66755ABA1B3B79220013E67E /* EZAudioDevice.h */,
-				66755ABB1B3B79220013E67E /* EZAudioDevice.m */,
-				66755ABC1B3B79220013E67E /* EZAudioDisplayLink.h */,
-				66755ABD1B3B79220013E67E /* EZAudioDisplayLink.m */,
-				66755ABE1B3B79220013E67E /* EZAudioFile.h */,
-				66755ABF1B3B79220013E67E /* EZAudioFile.m */,
-				66755AC01B3B79220013E67E /* EZAudioFloatConverter.h */,
-				66755AC11B3B79220013E67E /* EZAudioFloatConverter.m */,
-				66755AC21B3B79220013E67E /* EZAudioFloatData.h */,
-				66755AC31B3B79220013E67E /* EZAudioFloatData.m */,
-				66755AC41B3B79220013E67E /* EZAudioPlayer.h */,
-				66755AC51B3B79220013E67E /* EZAudioPlayer.m */,
-				66755AC61B3B79220013E67E /* EZAudioPlot.h */,
-				66755AC71B3B79220013E67E /* EZAudioPlot.m */,
-				66755AC81B3B79220013E67E /* EZAudioPlotGL.h */,
-				66755AC91B3B79220013E67E /* EZAudioPlotGL.m */,
-				66755ACC1B3B79220013E67E /* EZAudioUtilities.h */,
-				66755ACD1B3B79220013E67E /* EZAudioUtilities.m */,
-				66755ACE1B3B79230013E67E /* EZMicrophone.h */,
-				66755ACF1B3B79230013E67E /* EZMicrophone.m */,
-				66755AD01B3B79230013E67E /* EZOutput.h */,
-				66755AD11B3B79230013E67E /* EZOutput.m */,
-				66755AD21B3B79230013E67E /* EZPlot.h */,
-				66755AD31B3B79230013E67E /* EZPlot.m */,
-				66755AD41B3B79230013E67E /* EZRecorder.h */,
-				66755AD51B3B79230013E67E /* EZRecorder.m */,
-				66755AD61B3B79230013E67E /* TPCircularBuffer.c */,
-				66755AD71B3B79230013E67E /* TPCircularBuffer.h */,
-				66755AD81B3B79230013E67E /* VERSION */,
+				6659579D1B38B356003E97A1 /* AEFloatConverter.h */,
+				6659579E1B38B356003E97A1 /* AEFloatConverter.m */,
+				6659579F1B38B356003E97A1 /* EZAudio.h */,
+				665957A01B38B356003E97A1 /* EZAudio.m */,
+				665957A11B38B356003E97A1 /* EZAudioDevice.h */,
+				665957A21B38B356003E97A1 /* EZAudioDevice.m */,
+				665957A31B38B356003E97A1 /* EZAudioFile.h */,
+				665957A41B38B356003E97A1 /* EZAudioFile.m */,
+				665957A51B38B356003E97A1 /* EZAudioFloatConverter.h */,
+				665957A61B38B356003E97A1 /* EZAudioFloatConverter.m */,
+				665957A71B38B356003E97A1 /* EZAudioFloatData.h */,
+				665957A81B38B356003E97A1 /* EZAudioFloatData.m */,
+				665957A91B38B356003E97A1 /* EZAudioPlayer.h */,
+				665957AA1B38B356003E97A1 /* EZAudioPlayer.m */,
+				665957AB1B38B356003E97A1 /* EZAudioPlot.h */,
+				665957AC1B38B356003E97A1 /* EZAudioPlot.m */,
+				665957AD1B38B356003E97A1 /* EZAudioPlotGL.h */,
+				665957AE1B38B356003E97A1 /* EZAudioPlotGL.m */,
+				665957AF1B38B356003E97A1 /* EZAudioPlotGLKViewController.h */,
+				665957B01B38B356003E97A1 /* EZAudioPlotGLKViewController.m */,
+				665957B11B38B356003E97A1 /* EZAudioUtilities.h */,
+				665957B21B38B356003E97A1 /* EZAudioUtilities.m */,
+				665957B31B38B356003E97A1 /* EZMicrophone.h */,
+				665957B41B38B356003E97A1 /* EZMicrophone.m */,
+				665957B51B38B356003E97A1 /* EZOutput.h */,
+				665957B61B38B356003E97A1 /* EZOutput.m */,
+				665957B71B38B356003E97A1 /* EZPlot.h */,
+				665957B81B38B356003E97A1 /* EZPlot.m */,
+				665957B91B38B356003E97A1 /* EZRecorder.h */,
+				665957BA1B38B356003E97A1 /* EZRecorder.m */,
+				665957BB1B38B356003E97A1 /* TPCircularBuffer.c */,
+				665957BC1B38B356003E97A1 /* TPCircularBuffer.h */,
+				665957BD1B38B356003E97A1 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		66755AD81B3B79230013E67E /* VERSION */ = {
+		665957BD1B38B356003E97A1 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				66755AD91B3B79230013E67E /* CHANGELOG */,
-				66755ADA1B3B79230013E67E /* VERSION */,
+				665957BE1B38B356003E97A1 /* CHANGELOG */,
+				665957BF1B38B356003E97A1 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -245,7 +250,7 @@
 		94056E12185BB3D800EB94BA /* EZAudioRecordExample */ = {
 			isa = PBXGroup;
 			children = (
-				66755AB51B3B79220013E67E /* EZAudio */,
+				6659579C1B38B356003E97A1 /* EZAudio */,
 				94056E1E185BB3D800EB94BA /* AppDelegate.h */,
 				94056E1F185BB3D800EB94BA /* AppDelegate.m */,
 				94056E21185BB3D800EB94BA /* MainMenu.xib */,
@@ -365,12 +370,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				94056E17185BB3D800EB94BA /* InfoPlist.strings in Resources */,
-				66755AED1B3B79230013E67E /* VERSION in Resources */,
+				665957D11B38B356003E97A1 /* VERSION in Resources */,
 				94056E75185BB44200EB94BA /* RecordViewController.xib in Resources */,
 				94056E25185BB3D800EB94BA /* Images.xcassets in Resources */,
 				94056E1D185BB3D800EB94BA /* Credits.rtf in Resources */,
 				94056E23185BB3D800EB94BA /* MainMenu.xib in Resources */,
-				66755AEC1B3B79230013E67E /* CHANGELOG in Resources */,
+				665957D01B38B356003E97A1 /* CHANGELOG in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -389,24 +394,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				66755AE31B3B79230013E67E /* EZAudioPlot.m in Sources */,
-				66755AE21B3B79230013E67E /* EZAudioPlayer.m in Sources */,
+				665957CE1B38B356003E97A1 /* EZRecorder.m in Sources */,
 				94056E74185BB44200EB94BA /* RecordViewController.m in Sources */,
-				66755AE41B3B79230013E67E /* EZAudioPlotGL.m in Sources */,
-				66755ADF1B3B79230013E67E /* EZAudioFile.m in Sources */,
-				66755AE81B3B79230013E67E /* EZOutput.m in Sources */,
-				66755AE61B3B79230013E67E /* EZAudioUtilities.m in Sources */,
-				66755AE91B3B79230013E67E /* EZPlot.m in Sources */,
+				665957C41B38B356003E97A1 /* EZAudioFloatConverter.m in Sources */,
+				665957C51B38B356003E97A1 /* EZAudioFloatData.m in Sources */,
+				665957C01B38B356003E97A1 /* AEFloatConverter.m in Sources */,
+				665957C31B38B356003E97A1 /* EZAudioFile.m in Sources */,
+				665957CC1B38B356003E97A1 /* EZOutput.m in Sources */,
+				665957C81B38B356003E97A1 /* EZAudioPlotGL.m in Sources */,
+				665957CF1B38B356003E97A1 /* TPCircularBuffer.c in Sources */,
+				665957C71B38B356003E97A1 /* EZAudioPlot.m in Sources */,
 				94056E20185BB3D800EB94BA /* AppDelegate.m in Sources */,
-				66755AEA1B3B79230013E67E /* EZRecorder.m in Sources */,
-				66755AE11B3B79230013E67E /* EZAudioFloatData.m in Sources */,
-				66755AE01B3B79230013E67E /* EZAudioFloatConverter.m in Sources */,
-				66755ADE1B3B79230013E67E /* EZAudioDisplayLink.m in Sources */,
-				66755AE71B3B79230013E67E /* EZMicrophone.m in Sources */,
-				66755ADD1B3B79230013E67E /* EZAudioDevice.m in Sources */,
+				665957CB1B38B356003E97A1 /* EZMicrophone.m in Sources */,
+				665957C61B38B356003E97A1 /* EZAudioPlayer.m in Sources */,
+				665957C21B38B356003E97A1 /* EZAudioDevice.m in Sources */,
 				94056E19185BB3D800EB94BA /* main.m in Sources */,
-				66755AEB1B3B79230013E67E /* TPCircularBuffer.c in Sources */,
-				66755ADC1B3B79230013E67E /* EZAudio.m in Sources */,
+				665957CD1B38B356003E97A1 /* EZPlot.m in Sources */,
+				665957C11B38B356003E97A1 /* EZAudio.m in Sources */,
+				665957CA1B38B356003E97A1 /* EZAudioUtilities.m in Sources */,
+				665957C91B38B356003E97A1 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/AppDelegate.m

@@ -28,7 +28,8 @@
 @implementation AppDelegate
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
-{  
+{
+  
   // Swap in our view controller in the window's content view
   self.recordViewController = [[RecordViewController alloc] init];
   // Resize view controller to content view's current size

EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/Base.lproj/MainMenu.xib

@@ -1,17 +1,100 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4439" systemVersion="13A451" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4439"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
             <connections>
+                <action selector="orderFrontStandardAboutPanel:" destination="58" id="142"/>
                 <outlet property="delegate" destination="494" id="495"/>
             </connections>
         </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder">
+            <connections>
+                <action selector="alignCenter:" destination="499" id="518"/>
+                <action selector="alignJustified:" destination="500" id="523"/>
+                <action selector="alignLeft:" destination="498" id="524"/>
+                <action selector="alignRight:" destination="501" id="521"/>
+                <action selector="arrangeInFront:" destination="5" id="39"/>
+                <action selector="capitalizeWord:" destination="466" id="467"/>
+                <action selector="centerSelectionInVisibleArea:" destination="210" id="245"/>
+                <action selector="checkSpelling:" destination="201" id="225"/>
+                <action selector="clearRecentDocuments:" destination="126" id="127"/>
+                <action selector="copy:" destination="197" id="224"/>
+                <action selector="copyFont:" destination="403" id="428"/>
+                <action selector="copyRuler:" destination="506" id="522"/>
+                <action selector="cut:" destination="199" id="228"/>
+                <action selector="delete:" destination="202" id="235"/>
+                <action selector="hide:" destination="134" id="367"/>
+                <action selector="hideOtherApplications:" destination="145" id="368"/>
+                <action selector="loosenKerning:" destination="419" id="435"/>
+                <action selector="lowerBaseline:" destination="410" id="427"/>
+                <action selector="lowercaseWord:" destination="465" id="468"/>
+                <action selector="makeBaseWritingDirectionLeftToRight:" destination="511" id="526"/>
+                <action selector="makeBaseWritingDirectionNatural:" destination="510" id="525"/>
+                <action selector="makeBaseWritingDirectionRightToLeft:" destination="512" id="527"/>
+                <action selector="makeTextWritingDirectionLeftToRight:" destination="516" id="529"/>
+                <action selector="makeTextWritingDirectionNatural:" destination="515" id="528"/>
+                <action selector="makeTextWritingDirectionRightToLeft:" destination="517" id="530"/>
+                <action selector="newDocument:" destination="82" id="373"/>
+                <action selector="openDocument:" destination="72" id="374"/>
+                <action selector="orderFrontColorPanel:" destination="401" id="433"/>
+                <action selector="orderFrontSubstitutionsPanel:" destination="457" id="458"/>
+                <action selector="paste:" destination="203" id="226"/>
+                <action selector="pasteAsPlainText:" destination="485" id="486"/>
+                <action selector="pasteFont:" destination="404" id="436"/>
+                <action selector="pasteRuler:" destination="507" id="519"/>
+                <action selector="performClose:" destination="73" id="193"/>
+                <action selector="performFindPanelAction:" destination="209" id="241"/>
+                <action selector="performFindPanelAction:" destination="208" id="487"/>
+                <action selector="performFindPanelAction:" destination="213" id="488"/>
+                <action selector="performFindPanelAction:" destination="221" id="489"/>
+                <action selector="performFindPanelAction:" destination="534" id="535"/>
+                <action selector="performMiniaturize:" destination="23" id="37"/>
+                <action selector="performZoom:" destination="239" id="240"/>
+                <action selector="print:" destination="78" id="86"/>
+                <action selector="raiseBaseline:" destination="409" id="426"/>
+                <action selector="redo:" destination="215" id="231"/>
+                <action selector="revertDocumentToSaved:" destination="112" id="364"/>
+                <action selector="runPageLayout:" destination="77" id="87"/>
+                <action selector="runToolbarCustomizationPalette:" destination="298" id="365"/>
+                <action selector="saveDocument:" destination="75" id="362"/>
+                <action selector="selectAll:" destination="198" id="232"/>
+                <action selector="showGuessPanel:" destination="204" id="230"/>
+                <action selector="showHelp:" destination="492" id="493"/>
+                <action selector="startSpeaking:" destination="196" id="233"/>
+                <action selector="stopSpeaking:" destination="195" id="227"/>
+                <action selector="subscript:" destination="408" id="429"/>
+                <action selector="superscript:" destination="407" id="430"/>
+                <action selector="tightenKerning:" destination="418" id="431"/>
+                <action selector="toggleAutomaticDashSubstitution:" destination="460" id="461"/>
+                <action selector="toggleAutomaticLinkDetection:" destination="354" id="357"/>
+                <action selector="toggleAutomaticQuoteSubstitution:" destination="351" id="356"/>
+                <action selector="toggleAutomaticSpellingCorrection:" destination="454" id="456"/>
+                <action selector="toggleAutomaticTextReplacement:" destination="462" id="463"/>
+                <action selector="toggleContinuousSpellChecking:" destination="219" id="222"/>
+                <action selector="toggleGrammarChecking:" destination="346" id="347"/>
+                <action selector="toggleRuler:" destination="505" id="520"/>
+                <action selector="toggleSmartInsertDelete:" destination="350" id="355"/>
+                <action selector="toggleToolbarShown:" destination="297" id="366"/>
+                <action selector="turnOffKerning:" destination="417" id="441"/>
+                <action selector="turnOffLigatures:" destination="413" id="440"/>
+                <action selector="underline:" destination="392" id="432"/>
+                <action selector="undo:" destination="207" id="223"/>
+                <action selector="unhideAllApplications:" destination="150" id="370"/>
+                <action selector="unscript:" destination="406" id="437"/>
+                <action selector="uppercaseWord:" destination="452" id="464"/>
+                <action selector="useAllLigatures:" destination="414" id="434"/>
+                <action selector="useStandardKerning:" destination="416" id="438"/>
+                <action selector="useStandardLigatures:" destination="412" id="439"/>
+            </connections>
+        </customObject>
+        <customObject id="-3" userLabel="Application">
+            <connections>
+                <action selector="terminate:" destination="136" id="449"/>
+            </connections>
+        </customObject>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
                 <menuItem title="EZAudioRecordExample" id="56">
@@ -19,9 +102,6 @@
                         <items>
                             <menuItem title="About EZAudioRecordExample" id="58">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="236">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
@@ -36,211 +116,95 @@
                             <menuItem isSeparatorItem="YES" id="144">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Hide EZAudioRecordExample" keyEquivalent="h" id="134">
-                                <connections>
-                                    <action selector="hide:" target="-1" id="367"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Hide EZAudioRecordExample" keyEquivalent="h" id="134"/>
                             <menuItem title="Hide Others" keyEquivalent="h" id="145">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Show All" id="150">
-                                <connections>
-                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Show All" id="150"/>
                             <menuItem isSeparatorItem="YES" id="149">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Quit EZAudioRecordExample" keyEquivalent="q" id="136">
-                                <connections>
-                                    <action selector="terminate:" target="-3" id="449"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Quit EZAudioRecordExample" keyEquivalent="q" id="136"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="File" id="83">
                     <menu key="submenu" title="File" id="81">
                         <items>
-                            <menuItem title="New" keyEquivalent="n" id="82">
-                                <connections>
-                                    <action selector="newDocument:" target="-1" id="373"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Open…" keyEquivalent="o" id="72">
-                                <connections>
-                                    <action selector="openDocument:" target="-1" id="374"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="New" keyEquivalent="n" id="82"/>
+                            <menuItem title="Open…" keyEquivalent="o" id="72"/>
                             <menuItem title="Open Recent" id="124">
                                 <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
                                     <items>
-                                        <menuItem title="Clear Menu" id="126">
-                                            <connections>
-                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Clear Menu" id="126"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="79">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Close" keyEquivalent="w" id="73">
-                                <connections>
-                                    <action selector="performClose:" target="-1" id="193"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Save…" keyEquivalent="s" id="75">
-                                <connections>
-                                    <action selector="saveDocument:" target="-1" id="362"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73"/>
+                            <menuItem title="Save…" keyEquivalent="s" id="75"/>
                             <menuItem title="Revert to Saved" id="112">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="revertDocumentToSaved:" target="-1" id="364"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="74">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Page Setup..." keyEquivalent="P" id="77">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="runPageLayout:" target="-1" id="87"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Print…" keyEquivalent="p" id="78">
-                                <connections>
-                                    <action selector="print:" target="-1" id="86"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="78"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Edit" id="217">
                     <menu key="submenu" title="Edit" id="205">
                         <items>
-                            <menuItem title="Undo" keyEquivalent="z" id="207">
-                                <connections>
-                                    <action selector="undo:" target="-1" id="223"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Undo" keyEquivalent="z" id="207"/>
                             <menuItem title="Redo" keyEquivalent="Z" id="215">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="redo:" target="-1" id="231"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="206">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Cut" keyEquivalent="x" id="199">
-                                <connections>
-                                    <action selector="cut:" target="-1" id="228"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Copy" keyEquivalent="c" id="197">
-                                <connections>
-                                    <action selector="copy:" target="-1" id="224"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste" keyEquivalent="v" id="203">
-                                <connections>
-                                    <action selector="paste:" target="-1" id="226"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="199"/>
+                            <menuItem title="Copy" keyEquivalent="c" id="197"/>
+                            <menuItem title="Paste" keyEquivalent="v" id="203"/>
                             <menuItem title="Paste and Match Style" keyEquivalent="V" id="485">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="pasteAsPlainText:" target="-1" id="486"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Delete" id="202">
-                                <connections>
-                                    <action selector="delete:" target="-1" id="235"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="198">
-                                <connections>
-                                    <action selector="selectAll:" target="-1" id="232"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Delete" id="202"/>
+                            <menuItem title="Select All" keyEquivalent="a" id="198"/>
                             <menuItem isSeparatorItem="YES" id="214">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Find" id="218">
                                 <menu key="submenu" title="Find" id="220">
                                     <items>
-                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="241"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209"/>
                                         <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="534">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="535"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="487"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208"/>
                                         <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="213">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="488"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="489"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210">
-                                            <connections>
-                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221"/>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem title="Spelling and Grammar" id="216">
                                 <menu key="submenu" title="Spelling and Grammar" id="200">
                                     <items>
-                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204">
-                                            <connections>
-                                                <action selector="showGuessPanel:" target="-1" id="230"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201">
-                                            <connections>
-                                                <action selector="checkSpelling:" target="-1" id="225"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204"/>
+                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201"/>
                                         <menuItem isSeparatorItem="YES" id="453"/>
-                                        <menuItem title="Check Spelling While Typing" id="219">
-                                            <connections>
-                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="222"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Grammar With Spelling" id="346">
-                                            <connections>
-                                                <action selector="toggleGrammarChecking:" target="-1" id="347"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Check Spelling While Typing" id="219"/>
+                                        <menuItem title="Check Grammar With Spelling" id="346"/>
                                         <menuItem title="Correct Spelling Automatically" id="454">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="456"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -250,38 +214,18 @@
                                     <items>
                                         <menuItem title="Show Substitutions" id="457">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="458"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="459"/>
-                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350">
-                                            <connections>
-                                                <action selector="toggleSmartInsertDelete:" target="-1" id="355"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351">
-                                            <connections>
-                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="356"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350"/>
+                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351"/>
                                         <menuItem title="Smart Dashes" id="460">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="461"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Smart Links" tag="3" keyEquivalent="G" id="354">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="357"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Text Replacement" id="462">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="463"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -292,21 +236,12 @@
                                     <items>
                                         <menuItem title="Make Upper Case" id="452">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="uppercaseWord:" target="-1" id="464"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Make Lower Case" id="465">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="lowercaseWord:" target="-1" id="468"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Capitalize" id="466">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="capitalizeWord:" target="-1" id="467"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -314,16 +249,8 @@
                             <menuItem title="Speech" id="211">
                                 <menu key="submenu" title="Speech" id="212">
                                     <items>
-                                        <menuItem title="Start Speaking" id="196">
-                                            <connections>
-                                                <action selector="startSpeaking:" target="-1" id="233"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Stop Speaking" id="195">
-                                            <connections>
-                                                <action selector="stopSpeaking:" target="-1" id="227"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Start Speaking" id="196"/>
+                                        <menuItem title="Stop Speaking" id="195"/>
                                     </items>
                                 </menu>
                             </menuItem>
@@ -338,37 +265,13 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Font" systemMenu="font" id="388">
                                     <items>
-                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389">
-                                            <connections>
-                                                <action selector="orderFrontFontPanel:" target="420" id="424"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="421"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="422"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Underline" keyEquivalent="u" id="392">
-                                            <connections>
-                                                <action selector="underline:" target="-1" id="432"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389"/>
+                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390"/>
+                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391"/>
+                                        <menuItem title="Underline" keyEquivalent="u" id="392"/>
                                         <menuItem isSeparatorItem="YES" id="393"/>
-                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="425"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="423"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394"/>
+                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395"/>
                                         <menuItem isSeparatorItem="YES" id="396"/>
                                         <menuItem title="Kern" id="397">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -376,27 +279,15 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="416">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardKerning:" target="-1" id="438"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="417">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffKerning:" target="-1" id="441"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Tighten" id="418">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="tightenKerning:" target="-1" id="431"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Loosen" id="419">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="loosenKerning:" target="-1" id="435"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -407,21 +298,12 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="412">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardLigatures:" target="-1" id="439"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="413">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffLigatures:" target="-1" id="440"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use All" id="414">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useAllLigatures:" target="-1" id="434"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -432,55 +314,30 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="406">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="unscript:" target="-1" id="437"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Superscript" id="407">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="superscript:" target="-1" id="430"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Subscript" id="408">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="subscript:" target="-1" id="429"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Raise" id="409">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="raiseBaseline:" target="-1" id="426"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Lower" id="410">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="lowerBaseline:" target="-1" id="427"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="400"/>
-                                        <menuItem title="Show Colors" keyEquivalent="C" id="401">
-                                            <connections>
-                                                <action selector="orderFrontColorPanel:" target="-1" id="433"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Colors" keyEquivalent="C" id="401"/>
                                         <menuItem isSeparatorItem="YES" id="402"/>
                                         <menuItem title="Copy Style" keyEquivalent="c" id="403">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyFont:" target="-1" id="428"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Style" keyEquivalent="v" id="404">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteFont:" target="-1" id="436"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -489,27 +346,12 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Text" id="497">
                                     <items>
-                                        <menuItem title="Align Left" keyEquivalent="{" id="498">
-                                            <connections>
-                                                <action selector="alignLeft:" target="-1" id="524"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Center" keyEquivalent="|" id="499">
-                                            <connections>
-                                                <action selector="alignCenter:" target="-1" id="518"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Align Left" keyEquivalent="{" id="498"/>
+                                        <menuItem title="Center" keyEquivalent="|" id="499"/>
                                         <menuItem title="Justify" id="500">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="alignJustified:" target="-1" id="523"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Align Right" keyEquivalent="}" id="501">
-                                            <connections>
-                                                <action selector="alignRight:" target="-1" id="521"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Align Right" keyEquivalent="}" id="501"/>
                                         <menuItem isSeparatorItem="YES" id="502"/>
                                         <menuItem title="Writing Direction" id="503">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -521,23 +363,14 @@
                                                     <menuItem id="510">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionNatural:" target="-1" id="525"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="511">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="526"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="512">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="527"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem isSeparatorItem="YES" id="513"/>
                                                     <menuItem title="Selection" enabled="NO" id="514">
@@ -546,23 +379,14 @@
                                                     <menuItem id="515">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionNatural:" target="-1" id="528"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="516">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="529"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="517">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="530"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -570,21 +394,12 @@
                                         <menuItem isSeparatorItem="YES" id="504"/>
                                         <menuItem title="Show Ruler" id="505">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleRuler:" target="-1" id="520"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Copy Ruler" keyEquivalent="c" id="506">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyRuler:" target="-1" id="522"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Ruler" keyEquivalent="v" id="507">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteRuler:" target="-1" id="519"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -597,39 +412,20 @@
                         <items>
                             <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleToolbarShown:" target="-1" id="366"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Customize Toolbar…" id="298">
-                                <connections>
-                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="365"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Customize Toolbar…" id="298"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Window" id="19">
                     <menu key="submenu" title="Window" systemMenu="window" id="24">
                         <items>
-                            <menuItem title="Minimize" keyEquivalent="m" id="23">
-                                <connections>
-                                    <action selector="performMiniaturize:" target="-1" id="37"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Zoom" id="239">
-                                <connections>
-                                    <action selector="performZoom:" target="-1" id="240"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23"/>
+                            <menuItem title="Zoom" id="239"/>
                             <menuItem isSeparatorItem="YES" id="92">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Bring All to Front" id="5">
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="39"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5"/>
                         </items>
                     </menu>
                 </menuItem>
@@ -637,21 +433,17 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="491">
                         <items>
-                            <menuItem title="EZAudioRecordExample Help" keyEquivalent="?" id="492">
-                                <connections>
-                                    <action selector="showHelp:" target="-1" id="493"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="EZAudioRecordExample Help" keyEquivalent="?" id="492"/>
                         </items>
                     </menu>
                 </menuItem>
             </items>
         </menu>
         <window title="EZAudioRecordExample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <view key="contentView" id="372">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -662,6 +454,14 @@
                 <outlet property="window" destination="371" id="532"/>
             </connections>
         </customObject>
-        <customObject id="420" customClass="NSFontManager"/>
+        <customObject id="420" customClass="NSFontManager">
+            <connections>
+                <action selector="addFontTrait:" destination="390" id="421"/>
+                <action selector="addFontTrait:" destination="391" id="422"/>
+                <action selector="modifyFont:" destination="395" id="423"/>
+                <action selector="modifyFont:" destination="394" id="425"/>
+                <action selector="orderFrontFontPanel:" destination="389" id="424"/>
+            </connections>
+        </customObject>
     </objects>
 </document>

EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.h

@@ -28,116 +28,51 @@
 // Import EZAudio header
 #import "EZAudio.h"
 
+// Import AVFoundation to play the file (will save EZAudioFile and EZOutput for separate example)
+#import <AVFoundation/AVFoundation.h>
+
 // By default this will record a file to /Users/YOUR_USERNAME/Documents/test.caf
 #define kAudioFilePath [NSString stringWithFormat:@"%@%@",NSHomeDirectory(),@"/Documents/test.m4a"]
 
-//------------------------------------------------------------------------------
-#pragma mark - RecordViewController
-//------------------------------------------------------------------------------
-
 /**
  We will allow this view controller to act as an EZMicrophoneDelegate. This is how we listen for the microphone callback.
  */
-@interface RecordViewController : NSViewController <EZAudioPlayerDelegate,
-                                                    EZMicrophoneDelegate,
-                                                    EZRecorderDelegate>
-
-/**
- The label used to display the current time for recording/playback in the top left
- */
-@property (nonatomic, weak) IBOutlet NSTextField *currentTimeLabel;
-
-//------------------------------------------------------------------------------
+@interface RecordViewController : NSViewController <EZMicrophoneDelegate,AVAudioPlayerDelegate>
 
 /**
  Use a OpenGL based plot to visualize the data coming in
  */
-@property (nonatomic, weak) IBOutlet EZAudioPlotGL *recordingAudioPlot;
-
-//------------------------------------------------------------------------------
+@property (nonatomic,weak) IBOutlet EZAudioPlotGL *audioPlot;
 
 /**
  A flag indicating whether we are recording or not
  */
-@property (nonatomic, assign) BOOL isRecording;
-
-//------------------------------------------------------------------------------
+@property (nonatomic,assign) BOOL isRecording;
 
 /**
  The microphone component
  */
-@property (nonatomic, strong) EZMicrophone *microphone;
-
-//------------------------------------------------------------------------------
-
-/**
- The switch used to toggle the microphone on/off
- */
-@property (nonatomic, weak) IBOutlet NSButton *microphoneSwitch;
-
-//------------------------------------------------------------------------------
-
-/**
- The audio player that will play the recorded file
- */
-@property (nonatomic, strong) EZAudioPlayer *player;
-
-//------------------------------------------------------------------------------
+@property (nonatomic,strong) EZMicrophone *microphone;
 
 /**
  The recorder component
  */
-@property (nonatomic, strong) EZRecorder *recorder;
+@property (nonatomic,strong) EZRecorder *recorder;
 
-//------------------------------------------------------------------------------
-
-/**
- The second audio plot used on the top right to display the current playing audio
- */
-@property (nonatomic, weak) IBOutlet EZAudioPlot *playingAudioPlot;
-
-//------------------------------------------------------------------------------
-
-/**
- The button the user taps to play the recorded audio file
- */
-@property (nonatomic, weak) IBOutlet NSButton *playButton;
-
-//------------------------------------------------------------------------------
-
-/**
- The label used to display the audio player play state
- */
-@property (nonatomic, weak) IBOutlet NSTextField *playingStateLabel;
-
-//------------------------------------------------------------------------------
-
-/**
- The switch used to toggle the recording on/off
- */
-@property (nonatomic, weak) IBOutlet NSButton *recordSwitch;
-
-//------------------------------------------------------------------------------
 #pragma mark - Actions
-//------------------------------------------------------------------------------
-
 /**
  Stops the recorder and starts playing whatever has been recorded.
  */
-- (IBAction)playFile:(id)sender;
-
-//------------------------------------------------------------------------------
+-(IBAction)playFile:(id)sender;
 
 /**
  Toggles the microphone on and off. When the microphone is on it will send its delegate (aka this view controller) the audio data in various ways (check out the EZMicrophoneDelegate documentation for more details);
  */
-- (IBAction)toggleMicrophone:(id)sender;
-
-//------------------------------------------------------------------------------
+-(IBAction)toggleMicrophone:(id)sender;
 
 /**
  Toggles the microphone on and off. When the microphone is on it will send its delegate (aka this view controller) the audio data in various ways (check out the EZMicrophoneDelegate documentation for more details);
  */
-- (IBAction)toggleRecording:(id)sender;
+-(IBAction)toggleRecording:(id)sender;
 
 @end

EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.m

@@ -25,9 +25,12 @@
 
 #import "RecordViewController.h"
 
-//------------------------------------------------------------------------------
-#pragma mark - RecordViewController (Implementation)
-//------------------------------------------------------------------------------
+@interface RecordViewController ()
+@property (nonatomic,strong) AVAudioPlayer *audioPlayer;
+@property (nonatomic,weak) IBOutlet NSButton *microphoneToggle;
+@property (nonatomic,weak) IBOutlet NSButton *playButton;
+@property (nonatomic,weak) IBOutlet NSButton *recordingToggle;
+@end
 
 @implementation RecordViewController
 
@@ -35,106 +38,52 @@
 #pragma mark - Customize the Audio Plot
 //------------------------------------------------------------------------------
 
-- (void)awakeFromNib
+-(void)awakeFromNib
 {
-    
-    //
-    // Customizing the audio plot that'll show the current microphone input/recording
-    //
-    self.recordingAudioPlot.backgroundColor = [NSColor colorWithRed: 0.984 green: 0.71 blue: 0.365 alpha: 1];
-    self.recordingAudioPlot.color           = [NSColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:1.0];
-    self.recordingAudioPlot.plotType        = EZPlotTypeRolling;
-    self.recordingAudioPlot.shouldFill      = YES;
-    self.recordingAudioPlot.shouldMirror    = YES;
-    
-    //
-    // Customizing the audio plot that'll show the playback
-    //
-    self.playingAudioPlot.color = [NSColor whiteColor];
-    self.playingAudioPlot.plotType = EZPlotTypeRolling;
-    self.playingAudioPlot.shouldFill = YES;
-    self.playingAudioPlot.shouldMirror = YES;
-    self.playingAudioPlot.gain = 2.5f;
-    
-    // Create an instance of the microphone and tell it to use this view controller instance as the delegate
-    self.microphone = [EZMicrophone microphoneWithDelegate:self];
-    self.player = [EZAudioPlayer audioPlayerWithDelegate:self];
-    
-    //
-    // Initialize UI components
-    //
-    [self setTitle:@"Microphone On" forButton:self.microphoneSwitch];
-    [self setTitle:@"Not Recording" forButton:self.recordSwitch];
-    self.playingStateLabel.stringValue = @"Not Playing";
-    self.playButton.enabled = NO;
-    
-    //
-    // Setup notifications
-    //
-    [self setupNotifications];
-    
-    //
-    // Start the microphone
-    //
-    [self.microphone startFetchingAudio];
-}
+    /*
+     Customizing the audio plot's look
+    */
+    // Background color
+    self.audioPlot.backgroundColor = [NSColor colorWithCalibratedRed: 0.984 green: 0.71 blue: 0.365 alpha: 1];
+    // Waveform color
+    self.audioPlot.color           = [NSColor colorWithCalibratedRed: 1.000 green: 1.000 blue: 1.000 alpha: 1];
+    // Plot type
+    self.audioPlot.plotType        = EZPlotTypeRolling;
+    // Fill
+    self.audioPlot.shouldFill      = YES;
+    // Mirror
+    self.audioPlot.shouldMirror    = YES;
 
+    // Configure the play button
+    [self.playButton setHidden:YES];
 
-//------------------------------------------------------------------------------
-
-- (void)setupNotifications
-{
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(playerDidChangePlayState:)
-                                                 name:EZAudioPlayerDidChangePlayStateNotification
-                                               object:self.player];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(playerDidReachEndOfFile:)
-                                                 name:EZAudioPlayerDidReachEndOfFileNotification
-                                               object:self.player];
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Notifications
-//------------------------------------------------------------------------------
-
-- (void)playerDidChangePlayState:(NSNotification *)notification
-{
-    EZAudioPlayer *player = [notification object];
-    BOOL isPlaying = [player isPlaying];
-    if (isPlaying)
-    {
-        self.recorder.delegate = nil;
-    }
-    self.playingStateLabel.stringValue = isPlaying ? @"Playing" : @"Not Playing";
-    self.playingAudioPlot.hidden = !isPlaying;
-}
-
-//------------------------------------------------------------------------------
-
-- (void)playerDidReachEndOfFile:(NSNotification *)notification
-{
-    [self.playingAudioPlot clear];
+    /*
+     Start the microphone
+    */
+    self.microphone = [EZMicrophone microphoneWithDelegate:self startsImmediately:YES];
+  
 }
 
 //------------------------------------------------------------------------------
 #pragma mark - Actions
 //------------------------------------------------------------------------------
 
-- (void)playFile:(id)sender
+-(void)playFile:(id)sender
 {
     //
     // Update microphone state
     //
     [self.microphone stopFetchingAudio];
-    
+    self.microphoneToggle.state = NSOffState;
+    [self.microphoneToggle setEnabled:NO];
+
     //
     // Update recording state
     //
     self.isRecording = NO;
-    [self setTitle:@"Not Recording" forButton:self.recordSwitch];
-    self.recordSwitch.state = NSOffState;
-    
+    self.recordingToggle.state = NSOffState;
+    [self.recordingToggle setEnabled:NO];
+
     //
     // Close the audio file
     //
@@ -143,157 +92,124 @@
         [self.recorder closeAudioFile];
     }
     
-    EZAudioFile *audioFile = [EZAudioFile audioFileWithURL:[NSURL fileURLWithPath:kAudioFilePath]];
-    [self.player playAudioFile:audioFile];
+    //
+    // Create audio player
+    //
+    if (self.audioPlayer)
+    {
+        if (self.audioPlayer.playing) [self.audioPlayer stop];
+        self.audioPlayer = nil;
+    }
+    NSError *err;
+    self.audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:[NSURL fileURLWithPath:kAudioFilePath]
+                                                              error:&err];
+    
+    [self.audioPlayer play];
+    self.audioPlayer.delegate = self;
 }
 
 //------------------------------------------------------------------------------
 
-- (void)toggleMicrophone:(id)sender
+-(void)toggleMicrophone:(id)sender
 {
-    [self.player pause];
-    
-    NSInteger state = [(NSButton *)sender state];
-    if (state == NSOffState)
+    switch([sender state])
     {
-        [self.microphone stopFetchingAudio];
-    }
-    else
-    {
-        [self.microphone startFetchingAudio];
+        case NSOffState:
+            [self.microphone stopFetchingAudio];
+            break;
+        case NSOnState:
+            [self.microphone startFetchingAudio];
+            break;
+        default:
+            break;
     }
 }
 
 //------------------------------------------------------------------------------
 
-- (void)toggleRecording:(id)sender
+-(void)toggleRecording:(id)sender
 {
-    [self.player pause];
-    
-    NSInteger state = [(NSButton *)sender state];
-    if (state == NSOnState)
+    [self.playButton setHidden:NO];
+    switch( [sender state])
     {
-        //
-        // Create the recorder
-        //
-        [self.microphone startFetchingAudio];
-        self.recorder = [EZRecorder recorderWithURL:[NSURL fileURLWithPath:kAudioFilePath]
-                                       clientFormat:[self.microphone audioStreamBasicDescription]
-                                           fileType:EZRecorderFileTypeM4A
-                                           delegate:self];
-        self.playButton.enabled = YES;
+        case NSOffState:
+            [self.recorder closeAudioFile];
+            break;
+            
+        case NSOnState:
+            /*
+             Create the recorder
+             */
+            self.recorder = [EZRecorder recorderWithDestinationURL:[NSURL fileURLWithPath:kAudioFilePath]
+                                                      sourceFormat:self.microphone.audioStreamBasicDescription
+                                               destinationFileType:EZRecorderFileTypeM4A];
+            break;
+            
+        default:
+            break;
     }
-    self.isRecording = state;
-    NSString *title = self.isRecording ? @"Recording" : @"Not Recording";
-    [self setTitle:title forButton:self.recordSwitch];
+    self.isRecording = (BOOL)[sender state];
 }
 
 //------------------------------------------------------------------------------
 #pragma mark - EZMicrophoneDelegate
 //------------------------------------------------------------------------------
 
-- (void)microphone:(EZMicrophone *)microphone changedPlayingState:(BOOL)isPlaying
-{
-    self.microphoneSwitch.state = isPlaying;
-    NSString *title = isPlaying ? @"Microphone On" : @"Microphone Off";
-    [self setTitle:title forButton:self.microphoneSwitch];
-}
-
-//------------------------------------------------------------------------------
-
 #warning Thread Safety
 // Note that any callback that provides streamed audio data (like streaming microphone input) happens on a separate audio thread that should not be blocked. When we feed audio data into any of the UI components we need to explicity create a GCD block on the main thread to properly get the UI to work.
-- (void)   microphone:(EZMicrophone *)microphone
-     hasAudioReceived:(float **)buffer
-       withBufferSize:(UInt32)bufferSize
- withNumberOfChannels:(UInt32)numberOfChannels
+-(void)microphone:(EZMicrophone *)microphone
+ hasAudioReceived:(float **)buffer
+   withBufferSize:(UInt32)bufferSize
+withNumberOfChannels:(UInt32)numberOfChannels
 {
-    // Getting audio data as an array of float buffer arrays. What does that mean? Because the audio is coming in as a stereo signal the data is split into a left and right channel. So buffer[0] corresponds to the float* data for the left channel while buffer[1] corresponds to the float* data for the right channel.
-
-    // See the Thread Safety warning above, but in a nutshell these callbacks happen on a separate audio thread. We wrap any UI updating in a GCD block on the main thread to avoid blocking that audio flow.
+  // Getting audio data as an array of float buffer arrays. What does that mean? Because the audio is coming in as a stereo signal the data is split into a left and right channel. So buffer[0] corresponds to the float* data for the left channel while buffer[1] corresponds to the float* data for the right channel.
+  
+  // See the Thread Safety warning above, but in a nutshell these callbacks happen on a separate audio thread. We wrap any UI updating in a GCD block on the main thread to avoid blocking that audio flow.
     __weak typeof (self) weakSelf = self;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        // All the audio plot needs is the buffer data (float*) and the size. Internally the audio plot will handle all the drawing related code, history management, and freeing its own resources. Hence, one badass line of code gets you a pretty plot :)
-        [weakSelf.recordingAudioPlot updateBuffer:buffer[0]
-                                   withBufferSize:bufferSize];
+    dispatch_async(dispatch_get_main_queue(),^{
+    // All the audio plot needs is the buffer data (float*) and the size. Internally the audio plot will handle all the drawing related code, history management, and freeing its own resources. Hence, one badass line of code gets you a pretty plot :)
+        [weakSelf.audioPlot updateBuffer:buffer[0]
+                          withBufferSize:bufferSize];
     });
 }
 
 //------------------------------------------------------------------------------
 
-- (void)   microphone:(EZMicrophone *)microphone
+// Append the microphone data coming as a AudioBufferList with the specified buffer size to the recorder
+-(void)    microphone:(EZMicrophone *)microphone
         hasBufferList:(AudioBufferList *)bufferList
        withBufferSize:(UInt32)bufferSize
  withNumberOfChannels:(UInt32)numberOfChannels
 {
-    // Getting audio data as a buffer list that can be directly fed into the EZRecorder. This is happening on the audio thread - any UI updating needs a GCD main queue block. This will keep appending data to the tail of the audio file.
+    // Getting audio data as a buffer list that can be directly fed into the EZRecorder. This is happening on the audio thread - any UI updating needs a GCD main queue block.
     if (self.isRecording)
     {
         [self.recorder appendDataFromBufferList:bufferList
                                  withBufferSize:bufferSize];
-    }
+    }  
 }
 
 //------------------------------------------------------------------------------
-#pragma mark - EZRecorderDelegate
+#pragma mark - AVAudioPlayerDelegate
 //------------------------------------------------------------------------------
 
-- (void)recorderDidClose:(EZRecorder *)recorder
+/*
+ Occurs when the audio player instance completes playback
+ */
+-(void)audioPlayerDidFinishPlaying:(AVAudioPlayer *)player
+                      successfully:(BOOL)flag
 {
-    recorder.delegate = nil;
+    // Update microphone state
+    self.microphoneToggle.state = NSOnState;
+    [self.microphoneToggle setEnabled:YES];
+    [self.microphone startFetchingAudio];
+
+    // Update recording state
+    self.isRecording = NO;
+    self.recordingToggle.state = NSOffState;
+    [self.recordingToggle setEnabled:YES];
 }
 
 //------------------------------------------------------------------------------
 
-- (void)recorderUpdatedCurrentTime:(EZRecorder *)recorder
-{
-    __weak typeof (self) weakSelf = self;
-    NSString *formattedCurrentTime = [recorder formattedCurrentTime];
-    dispatch_async(dispatch_get_main_queue(), ^{
-        weakSelf.currentTimeLabel.stringValue = formattedCurrentTime;
-    });
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - EZAudioPlayerDelegate
-//------------------------------------------------------------------------------
-
-- (void) audioPlayer:(EZAudioPlayer *)audioPlayer
-         playedAudio:(float **)buffer
-      withBufferSize:(UInt32)bufferSize
- withNumberOfChannels:(UInt32)numberOfChannels
-          inAudioFile:(EZAudioFile *)audioFile
-{
-    __weak typeof (self) weakSelf = self;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [weakSelf.playingAudioPlot updateBuffer:buffer[0]
-                                 withBufferSize:bufferSize];
-    });
-}
-
-//------------------------------------------------------------------------------
-
-- (void)audioPlayer:(EZAudioPlayer *)audioPlayer
-    updatedPosition:(SInt64)framePosition
-        inAudioFile:(EZAudioFile *)audioFile
-{
-    __weak typeof (self) weakSelf = self;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        weakSelf.currentTimeLabel.stringValue = [audioPlayer formattedCurrentTime];
-    });
-}
-
-//------------------------------------------------------------------------------
-#pragma mark - Utility
-//------------------------------------------------------------------------------
-
-- (void)setTitle:(NSString *)title forButton:(NSButton *)button
-{
-    NSDictionary *attributes = @{ NSForegroundColorAttributeName : [NSColor whiteColor] };
-    NSAttributedString *attributedTitle = [[NSAttributedString alloc] initWithString:title
-                                                                          attributes:attributes];
-    button.attributedTitle = attributedTitle;
-    button.attributedAlternateTitle = attributedTitle;
-}
-
 @end

EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.xib

@@ -1,116 +1,79 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="RecordViewController">
             <connections>
-                <outlet property="currentTimeLabel" destination="HxF-TY-fDR" id="zwj-XE-ACe"/>
-                <outlet property="microphoneSwitch" destination="642-4u-aBm" id="AEv-nm-gLS"/>
-                <outlet property="playButton" destination="y4R-NE-icG" id="kHv-iM-mCt"/>
-                <outlet property="playingAudioPlot" destination="1yQ-Hd-JGR" id="Hdj-Ve-A6A"/>
-                <outlet property="playingStateLabel" destination="y9d-HG-0Rl" id="YXg-yy-Q9t"/>
-                <outlet property="recordSwitch" destination="fdr-L4-Y6i" id="Rqe-gC-lfh"/>
-                <outlet property="recordingAudioPlot" destination="dEs-hA-819" id="ACe-8h-ags"/>
+                <outlet property="audioPlot" destination="dEs-hA-819" id="iGa-BH-xLn"/>
+                <outlet property="microphoneToggle" destination="642-4u-aBm" id="FYB-Cp-aPB"/>
+                <outlet property="playButton" destination="y4R-NE-icG" id="1FP-aQ-BcB"/>
+                <outlet property="recordingToggle" destination="fdr-L4-Y6i" id="dYX-uf-6YS"/>
                 <outlet property="view" destination="178-e9-GIn" id="bPz-Je-f18"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="-3" userLabel="Application"/>
         <customView id="178-e9-GIn">
             <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="dEs-hA-819" customClass="EZAudioPlotGL">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
-                    <subviews>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HxF-TY-fDR">
-                            <rect key="frame" x="16" y="193" width="85" height="39"/>
-                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="00:00" id="Lsu-38-RnW">
-                                <font key="font" size="32" name="HelveticaNeue-Light"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="1yQ-Hd-JGR" customClass="EZAudioPlot">
-                            <rect key="frame" x="108" y="193" width="354" height="39"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="39" id="Cmv-Of-yxB"/>
-                            </constraints>
-                        </customView>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="642-4u-aBm">
-                            <rect key="frame" x="16" y="39" width="119" height="18"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="115" id="jzA-c9-gss"/>
-                            </constraints>
-                            <buttonCell key="cell" type="check" title="Microphone Off" alternateTitle="Microphone On" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="WpM-g2-QmU">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="toggleMicrophone:" target="-2" id="xOT-qg-D3j"/>
-                            </connections>
-                        </button>
-                        <button translatesAutoresizingMaskIntoConstraints="NO" id="fdr-L4-Y6i">
-                            <rect key="frame" x="16" y="16" width="113" height="18"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="109" id="XVw-ku-8Kp"/>
-                            </constraints>
-                            <buttonCell key="cell" type="check" title="Not Recording" alternateTitle="Recording" bezelStyle="regularSquare" imagePosition="left" inset="2" id="j1l-ue-yI3">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="toggleRecording:" target="-2" id="WKw-uD-CBI"/>
-                            </connections>
-                        </button>
-                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y4R-NE-icG">
-                            <rect key="frame" x="12" y="57" width="65" height="32"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="53" id="eH3-f2-ls9"/>
-                            </constraints>
-                            <buttonCell key="cell" type="push" title="Play" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XoV-qX-N9x">
-                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                <font key="font" metaFont="system"/>
-                            </buttonCell>
-                            <connections>
-                                <action selector="playFile:" target="-2" id="jrd-yg-pvq"/>
-                            </connections>
-                        </button>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y9d-HG-0Rl">
-                            <rect key="frame" x="76" y="66" width="75" height="17"/>
-                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Not Playing" id="pde-yf-Cac">
-                                <font key="font" metaFont="system"/>
-                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="y9d-HG-0Rl" firstAttribute="leading" secondItem="y4R-NE-icG" secondAttribute="trailing" constant="7" id="5mU-Du-t8h"/>
-                        <constraint firstItem="fdr-L4-Y6i" firstAttribute="leading" secondItem="642-4u-aBm" secondAttribute="leading" id="6HB-Yz-Xlv"/>
-                        <constraint firstItem="642-4u-aBm" firstAttribute="top" secondItem="y4R-NE-icG" secondAttribute="bottom" constant="9" id="Gvt-cc-iCu"/>
-                        <constraint firstItem="1yQ-Hd-JGR" firstAttribute="top" secondItem="dEs-hA-819" secondAttribute="top" constant="40" id="MIg-OC-dHb"/>
-                        <constraint firstItem="1yQ-Hd-JGR" firstAttribute="leading" secondItem="HxF-TY-fDR" secondAttribute="trailing" constant="9" id="Njb-Oj-SUR"/>
-                        <constraint firstItem="HxF-TY-fDR" firstAttribute="leading" secondItem="dEs-hA-819" secondAttribute="leading" constant="18" id="Y42-ar-917"/>
-                        <constraint firstItem="y4R-NE-icG" firstAttribute="leading" secondItem="HxF-TY-fDR" secondAttribute="leading" id="eTn-op-NgF"/>
-                        <constraint firstItem="fdr-L4-Y6i" firstAttribute="top" secondItem="642-4u-aBm" secondAttribute="bottom" constant="9" id="hb4-N7-xjI"/>
-                        <constraint firstItem="HxF-TY-fDR" firstAttribute="top" secondItem="dEs-hA-819" secondAttribute="top" constant="40" id="kI9-mf-kW9"/>
-                        <constraint firstAttribute="trailing" secondItem="1yQ-Hd-JGR" secondAttribute="trailing" constant="18" id="nDj-wc-gcG"/>
-                        <constraint firstAttribute="bottom" secondItem="fdr-L4-Y6i" secondAttribute="bottom" constant="18" id="nGo-GX-HZv"/>
-                        <constraint firstItem="642-4u-aBm" firstAttribute="leading" secondItem="y4R-NE-icG" secondAttribute="leading" id="o9C-CB-nEE"/>
-                        <constraint firstItem="y9d-HG-0Rl" firstAttribute="centerY" secondItem="y4R-NE-icG" secondAttribute="centerY" id="xIG-Gy-XOS"/>
-                    </constraints>
+                    <rect key="frame" x="0.0" y="42" width="480" height="230"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                 </customView>
+                <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="642-4u-aBm">
+                    <rect key="frame" x="18" y="14" width="119" height="18"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="14" id="DDP-K1-hjt"/>
+                    </constraints>
+                    <buttonCell key="cell" type="check" title="Microphone Off" alternateTitle="Microphone On" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="WpM-g2-QmU">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="toggleMicrophone:" target="-2" id="xOT-qg-D3j"/>
+                    </connections>
+                </button>
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="fdr-L4-Y6i">
+                    <rect key="frame" x="349" y="14" width="113" height="18"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <buttonCell key="cell" type="check" title="Not Recording" alternateTitle="Recording" bezelStyle="regularSquare" imagePosition="left" inset="2" id="j1l-ue-yI3">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="toggleRecording:" target="-2" id="WKw-uD-CBI"/>
+                    </connections>
+                </button>
+                <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="y4R-NE-icG">
+                    <rect key="frame" x="137" y="6" width="65" height="32"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <buttonCell key="cell" type="push" title="Play" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XoV-qX-N9x">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="playFile:" target="-2" id="jrd-yg-pvq"/>
+                    </connections>
+                </button>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="dEs-hA-819" secondAttribute="trailing" id="R5V-pX-y9Q"/>
-                <constraint firstItem="dEs-hA-819" firstAttribute="leading" secondItem="178-e9-GIn" secondAttribute="leading" id="UWT-Ay-DKN"/>
-                <constraint firstAttribute="bottom" secondItem="dEs-hA-819" secondAttribute="bottom" id="ajJ-h2-gWy"/>
-                <constraint firstItem="dEs-hA-819" firstAttribute="top" secondItem="178-e9-GIn" secondAttribute="top" id="h1e-yD-I80"/>
+                <constraint firstAttribute="bottom" secondItem="642-4u-aBm" secondAttribute="bottom" constant="16" id="LIb-Ej-46s"/>
+                <constraint firstAttribute="bottom" secondItem="fdr-L4-Y6i" secondAttribute="bottom" constant="16" id="Pvr-gh-o7q"/>
+                <constraint firstItem="642-4u-aBm" firstAttribute="top" secondItem="dEs-hA-819" secondAttribute="bottom" constant="12" id="QgB-Ty-AN0"/>
+                <constraint firstAttribute="bottom" secondItem="y4R-NE-icG" secondAttribute="bottom" constant="13" id="UX6-ts-w3M"/>
+                <constraint firstItem="y4R-NE-icG" firstAttribute="leading" secondItem="642-4u-aBm" secondAttribute="trailing" constant="8" id="ZbS-5O-fFJ"/>
+                <constraint firstItem="642-4u-aBm" firstAttribute="leading" secondItem="178-e9-GIn" secondAttribute="leading" constant="20" id="ayr-0v-aOC"/>
+                <constraint firstAttribute="trailing" secondItem="fdr-L4-Y6i" secondAttribute="trailing" constant="20" id="hk9-I9-9g5"/>
+                <constraint firstItem="dEs-hA-819" firstAttribute="top" secondItem="178-e9-GIn" secondAttribute="top" id="mv6-AK-Cz4"/>
+                <constraint firstAttribute="trailing" secondItem="dEs-hA-819" secondAttribute="trailing" id="tqk-1H-SZ4"/>
+                <constraint firstItem="y4R-NE-icG" firstAttribute="top" secondItem="dEs-hA-819" secondAttribute="bottom" constant="8" id="xzp-cM-xAL"/>
+                <constraint firstItem="dEs-hA-819" firstAttribute="leading" secondItem="178-e9-GIn" secondAttribute="leading" id="yvm-d3-Fzl"/>
             </constraints>
         </customView>
     </objects>
-</document>
+</document>

EZAudioExamples/OSX/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample.xcodeproj/project.pbxproj

@@ -7,23 +7,24 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		66755B151B3B792A0013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AF21B3B792A0013E67E /* EZAudio.m */; };
-		66755B161B3B792A0013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AF41B3B792A0013E67E /* EZAudioDevice.m */; };
-		66755B171B3B792A0013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AF61B3B792A0013E67E /* EZAudioDisplayLink.m */; };
-		66755B181B3B792A0013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AF81B3B792A0013E67E /* EZAudioFile.m */; };
-		66755B191B3B792A0013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AFA1B3B792A0013E67E /* EZAudioFloatConverter.m */; };
-		66755B1A1B3B792A0013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AFC1B3B792A0013E67E /* EZAudioFloatData.m */; };
-		66755B1B1B3B792A0013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755AFE1B3B792A0013E67E /* EZAudioPlayer.m */; };
-		66755B1C1B3B792A0013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B001B3B792A0013E67E /* EZAudioPlot.m */; };
-		66755B1D1B3B792A0013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B021B3B792A0013E67E /* EZAudioPlotGL.m */; };
-		66755B1F1B3B792A0013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B061B3B792A0013E67E /* EZAudioUtilities.m */; };
-		66755B201B3B792A0013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B081B3B792A0013E67E /* EZMicrophone.m */; };
-		66755B211B3B792A0013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B0A1B3B792A0013E67E /* EZOutput.m */; };
-		66755B221B3B792A0013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B0C1B3B792A0013E67E /* EZPlot.m */; };
-		66755B231B3B792A0013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 66755B0E1B3B792A0013E67E /* EZRecorder.m */; };
-		66755B241B3B792A0013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 66755B0F1B3B792A0013E67E /* TPCircularBuffer.c */; };
-		66755B251B3B792A0013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 66755B121B3B792A0013E67E /* CHANGELOG */; };
-		66755B261B3B792A0013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 66755B131B3B792A0013E67E /* VERSION */; };
+		6628E25A1B3A1A1C00020E56 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2381B3A1A1B00020E56 /* AEFloatConverter.m */; };
+		6628E25B1B3A1A1C00020E56 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E23A1B3A1A1B00020E56 /* EZAudio.m */; };
+		6628E25C1B3A1A1C00020E56 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E23C1B3A1A1B00020E56 /* EZAudioDevice.m */; };
+		6628E25D1B3A1A1C00020E56 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E23E1B3A1A1B00020E56 /* EZAudioFile.m */; };
+		6628E25E1B3A1A1C00020E56 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2401B3A1A1B00020E56 /* EZAudioFloatConverter.m */; };
+		6628E25F1B3A1A1C00020E56 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2421B3A1A1B00020E56 /* EZAudioFloatData.m */; };
+		6628E2601B3A1A1C00020E56 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2441B3A1A1B00020E56 /* EZAudioPlayer.m */; };
+		6628E2611B3A1A1C00020E56 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2461B3A1A1B00020E56 /* EZAudioPlot.m */; };
+		6628E2621B3A1A1C00020E56 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2481B3A1A1B00020E56 /* EZAudioPlotGL.m */; };
+		6628E2631B3A1A1C00020E56 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E24A1B3A1A1B00020E56 /* EZAudioPlotGLKViewController.m */; };
+		6628E2641B3A1A1C00020E56 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E24C1B3A1A1C00020E56 /* EZAudioUtilities.m */; };
+		6628E2651B3A1A1C00020E56 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E24E1B3A1A1C00020E56 /* EZMicrophone.m */; };
+		6628E2661B3A1A1C00020E56 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2501B3A1A1C00020E56 /* EZOutput.m */; };
+		6628E2671B3A1A1C00020E56 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2521B3A1A1C00020E56 /* EZPlot.m */; };
+		6628E2681B3A1A1C00020E56 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2541B3A1A1C00020E56 /* EZRecorder.m */; };
+		6628E2691B3A1A1C00020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2551B3A1A1C00020E56 /* TPCircularBuffer.c */; };
+		6628E26A1B3A1A1C00020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2581B3A1A1C00020E56 /* CHANGELOG */; };
+		6628E26B1B3A1A1C00020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2591B3A1A1C00020E56 /* VERSION */; };
 		94056E83185BCBC000EB94BA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94056E82185BCBC000EB94BA /* Cocoa.framework */; };
 		94056E8D185BCBC000EB94BA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 94056E8B185BCBC000EB94BA /* InfoPlist.strings */; };
 		94056E8F185BCBC000EB94BA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 94056E8E185BCBC000EB94BA /* main.m */; };
@@ -57,38 +58,40 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		66755AF11B3B792A0013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		66755AF21B3B792A0013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		66755AF31B3B792A0013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		66755AF41B3B792A0013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		66755AF51B3B792A0013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		66755AF61B3B792A0013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		66755AF71B3B792A0013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		66755AF81B3B792A0013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		66755AF91B3B792A0013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		66755AFA1B3B792A0013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		66755AFB1B3B792A0013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		66755AFC1B3B792A0013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		66755AFD1B3B792A0013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		66755AFE1B3B792A0013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		66755AFF1B3B792A0013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		66755B001B3B792A0013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		66755B011B3B792A0013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		66755B021B3B792A0013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		66755B051B3B792A0013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		66755B061B3B792A0013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		66755B071B3B792A0013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		66755B081B3B792A0013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		66755B091B3B792A0013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		66755B0A1B3B792A0013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		66755B0B1B3B792A0013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		66755B0C1B3B792A0013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		66755B0D1B3B792A0013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		66755B0E1B3B792A0013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		66755B0F1B3B792A0013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		66755B101B3B792A0013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		66755B121B3B792A0013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		66755B131B3B792A0013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E2371B3A1A1B00020E56 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		6628E2381B3A1A1B00020E56 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		6628E2391B3A1A1B00020E56 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		6628E23A1B3A1A1B00020E56 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		6628E23B1B3A1A1B00020E56 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		6628E23C1B3A1A1B00020E56 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		6628E23D1B3A1A1B00020E56 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		6628E23E1B3A1A1B00020E56 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		6628E23F1B3A1A1B00020E56 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		6628E2401B3A1A1B00020E56 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		6628E2411B3A1A1B00020E56 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		6628E2421B3A1A1B00020E56 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		6628E2431B3A1A1B00020E56 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		6628E2441B3A1A1B00020E56 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		6628E2451B3A1A1B00020E56 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		6628E2461B3A1A1B00020E56 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		6628E2471B3A1A1B00020E56 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		6628E2481B3A1A1B00020E56 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		6628E2491B3A1A1B00020E56 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		6628E24A1B3A1A1B00020E56 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		6628E24B1B3A1A1B00020E56 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		6628E24C1B3A1A1C00020E56 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		6628E24D1B3A1A1C00020E56 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		6628E24E1B3A1A1C00020E56 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		6628E24F1B3A1A1C00020E56 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		6628E2501B3A1A1C00020E56 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		6628E2511B3A1A1C00020E56 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		6628E2521B3A1A1C00020E56 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		6628E2531B3A1A1C00020E56 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		6628E2541B3A1A1C00020E56 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		6628E2551B3A1A1C00020E56 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		6628E2561B3A1A1C00020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		6628E2581B3A1A1C00020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		6628E2591B3A1A1C00020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		94056E7F185BCBC000EB94BA /* EZAudioWaveformFromFileExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioWaveformFromFileExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		94056E82185BCBC000EB94BA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		94056E85185BCBC000EB94BA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -147,50 +150,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		66755AEE1B3B792A0013E67E /* EZAudio */ = {
+		6628E2361B3A1A1B00020E56 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				66755AF11B3B792A0013E67E /* EZAudio.h */,
-				66755AF21B3B792A0013E67E /* EZAudio.m */,
-				66755AF31B3B792A0013E67E /* EZAudioDevice.h */,
-				66755AF41B3B792A0013E67E /* EZAudioDevice.m */,
-				66755AF51B3B792A0013E67E /* EZAudioDisplayLink.h */,
-				66755AF61B3B792A0013E67E /* EZAudioDisplayLink.m */,
-				66755AF71B3B792A0013E67E /* EZAudioFile.h */,
-				66755AF81B3B792A0013E67E /* EZAudioFile.m */,
-				66755AF91B3B792A0013E67E /* EZAudioFloatConverter.h */,
-				66755AFA1B3B792A0013E67E /* EZAudioFloatConverter.m */,
-				66755AFB1B3B792A0013E67E /* EZAudioFloatData.h */,
-				66755AFC1B3B792A0013E67E /* EZAudioFloatData.m */,
-				66755AFD1B3B792A0013E67E /* EZAudioPlayer.h */,
-				66755AFE1B3B792A0013E67E /* EZAudioPlayer.m */,
-				66755AFF1B3B792A0013E67E /* EZAudioPlot.h */,
-				66755B001B3B792A0013E67E /* EZAudioPlot.m */,
-				66755B011B3B792A0013E67E /* EZAudioPlotGL.h */,
-				66755B021B3B792A0013E67E /* EZAudioPlotGL.m */,
-				66755B051B3B792A0013E67E /* EZAudioUtilities.h */,
-				66755B061B3B792A0013E67E /* EZAudioUtilities.m */,
-				66755B071B3B792A0013E67E /* EZMicrophone.h */,
-				66755B081B3B792A0013E67E /* EZMicrophone.m */,
-				66755B091B3B792A0013E67E /* EZOutput.h */,
-				66755B0A1B3B792A0013E67E /* EZOutput.m */,
-				66755B0B1B3B792A0013E67E /* EZPlot.h */,
-				66755B0C1B3B792A0013E67E /* EZPlot.m */,
-				66755B0D1B3B792A0013E67E /* EZRecorder.h */,
-				66755B0E1B3B792A0013E67E /* EZRecorder.m */,
-				66755B0F1B3B792A0013E67E /* TPCircularBuffer.c */,
-				66755B101B3B792A0013E67E /* TPCircularBuffer.h */,
-				66755B111B3B792A0013E67E /* VERSION */,
+				6628E2371B3A1A1B00020E56 /* AEFloatConverter.h */,
+				6628E2381B3A1A1B00020E56 /* AEFloatConverter.m */,
+				6628E2391B3A1A1B00020E56 /* EZAudio.h */,
+				6628E23A1B3A1A1B00020E56 /* EZAudio.m */,
+				6628E23B1B3A1A1B00020E56 /* EZAudioDevice.h */,
+				6628E23C1B3A1A1B00020E56 /* EZAudioDevice.m */,
+				6628E23D1B3A1A1B00020E56 /* EZAudioFile.h */,
+				6628E23E1B3A1A1B00020E56 /* EZAudioFile.m */,
+				6628E23F1B3A1A1B00020E56 /* EZAudioFloatConverter.h */,
+				6628E2401B3A1A1B00020E56 /* EZAudioFloatConverter.m */,
+				6628E2411B3A1A1B00020E56 /* EZAudioFloatData.h */,
+				6628E2421B3A1A1B00020E56 /* EZAudioFloatData.m */,
+				6628E2431B3A1A1B00020E56 /* EZAudioPlayer.h */,
+				6628E2441B3A1A1B00020E56 /* EZAudioPlayer.m */,
+				6628E2451B3A1A1B00020E56 /* EZAudioPlot.h */,
+				6628E2461B3A1A1B00020E56 /* EZAudioPlot.m */,
+				6628E2471B3A1A1B00020E56 /* EZAudioPlotGL.h */,
+				6628E2481B3A1A1B00020E56 /* EZAudioPlotGL.m */,
+				6628E2491B3A1A1B00020E56 /* EZAudioPlotGLKViewController.h */,
+				6628E24A1B3A1A1B00020E56 /* EZAudioPlotGLKViewController.m */,
+				6628E24B1B3A1A1B00020E56 /* EZAudioUtilities.h */,
+				6628E24C1B3A1A1C00020E56 /* EZAudioUtilities.m */,
+				6628E24D1B3A1A1C00020E56 /* EZMicrophone.h */,
+				6628E24E1B3A1A1C00020E56 /* EZMicrophone.m */,
+				6628E24F1B3A1A1C00020E56 /* EZOutput.h */,
+				6628E2501B3A1A1C00020E56 /* EZOutput.m */,
+				6628E2511B3A1A1C00020E56 /* EZPlot.h */,
+				6628E2521B3A1A1C00020E56 /* EZPlot.m */,
+				6628E2531B3A1A1C00020E56 /* EZRecorder.h */,
+				6628E2541B3A1A1C00020E56 /* EZRecorder.m */,
+				6628E2551B3A1A1C00020E56 /* TPCircularBuffer.c */,
+				6628E2561B3A1A1C00020E56 /* TPCircularBuffer.h */,
+				6628E2571B3A1A1C00020E56 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		66755B111B3B792A0013E67E /* VERSION */ = {
+		6628E2571B3A1A1C00020E56 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				66755B121B3B792A0013E67E /* CHANGELOG */,
-				66755B131B3B792A0013E67E /* VERSION */,
+				6628E2581B3A1A1C00020E56 /* CHANGELOG */,
+				6628E2591B3A1A1C00020E56 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -243,7 +248,7 @@
 		94056E88185BCBC000EB94BA /* EZAudioWaveformFromFileExample */ = {
 			isa = PBXGroup;
 			children = (
-				66755AEE1B3B792A0013E67E /* EZAudio */,
+				6628E2361B3A1A1B00020E56 /* EZAudio */,
 				94056E94185BCBC000EB94BA /* AppDelegate.h */,
 				94056E95185BCBC000EB94BA /* AppDelegate.m */,
 				94056EDB185BCC0100EB94BA /* WaveformFromFileViewController.h */,
@@ -365,10 +370,10 @@
 			files = (
 				94056E8D185BCBC000EB94BA /* InfoPlist.strings in Resources */,
 				94056E9B185BCBC000EB94BA /* Images.xcassets in Resources */,
-				66755B251B3B792A0013E67E /* CHANGELOG in Resources */,
+				6628E26A1B3A1A1C00020E56 /* CHANGELOG in Resources */,
 				9417A6D31865927500D9D37B /* simple-drum-beat.wav in Resources */,
 				94056EDF185BCC0200EB94BA /* WaveformFromFileViewController.xib in Resources */,
-				66755B261B3B792A0013E67E /* VERSION in Resources */,
+				6628E26B1B3A1A1C00020E56 /* VERSION in Resources */,
 				94056E93185BCBC000EB94BA /* Credits.rtf in Resources */,
 				94056E99185BCBC000EB94BA /* MainMenu.xib in Resources */,
 			);
@@ -389,24 +394,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				66755B1C1B3B792A0013E67E /* EZAudioPlot.m in Sources */,
-				66755B1B1B3B792A0013E67E /* EZAudioPlayer.m in Sources */,
+				6628E2681B3A1A1C00020E56 /* EZRecorder.m in Sources */,
 				94056E96185BCBC000EB94BA /* AppDelegate.m in Sources */,
-				66755B1D1B3B792A0013E67E /* EZAudioPlotGL.m in Sources */,
-				66755B181B3B792A0013E67E /* EZAudioFile.m in Sources */,
-				66755B211B3B792A0013E67E /* EZOutput.m in Sources */,
-				66755B1F1B3B792A0013E67E /* EZAudioUtilities.m in Sources */,
-				66755B221B3B792A0013E67E /* EZPlot.m in Sources */,
+				6628E25E1B3A1A1C00020E56 /* EZAudioFloatConverter.m in Sources */,
+				6628E25F1B3A1A1C00020E56 /* EZAudioFloatData.m in Sources */,
+				6628E25A1B3A1A1C00020E56 /* AEFloatConverter.m in Sources */,
+				6628E25D1B3A1A1C00020E56 /* EZAudioFile.m in Sources */,
+				6628E2661B3A1A1C00020E56 /* EZOutput.m in Sources */,
+				6628E2621B3A1A1C00020E56 /* EZAudioPlotGL.m in Sources */,
+				6628E2691B3A1A1C00020E56 /* TPCircularBuffer.c in Sources */,
+				6628E2611B3A1A1C00020E56 /* EZAudioPlot.m in Sources */,
 				94056EDE185BCC0200EB94BA /* WaveformFromFileViewController.m in Sources */,
-				66755B231B3B792A0013E67E /* EZRecorder.m in Sources */,
-				66755B1A1B3B792A0013E67E /* EZAudioFloatData.m in Sources */,
-				66755B191B3B792A0013E67E /* EZAudioFloatConverter.m in Sources */,
-				66755B171B3B792A0013E67E /* EZAudioDisplayLink.m in Sources */,
-				66755B201B3B792A0013E67E /* EZMicrophone.m in Sources */,
-				66755B161B3B792A0013E67E /* EZAudioDevice.m in Sources */,
+				6628E2651B3A1A1C00020E56 /* EZMicrophone.m in Sources */,
+				6628E2601B3A1A1C00020E56 /* EZAudioPlayer.m in Sources */,
+				6628E25C1B3A1A1C00020E56 /* EZAudioDevice.m in Sources */,
 				94056E8F185BCBC000EB94BA /* main.m in Sources */,
-				66755B241B3B792A0013E67E /* TPCircularBuffer.c in Sources */,
-				66755B151B3B792A0013E67E /* EZAudio.m in Sources */,
+				6628E2671B3A1A1C00020E56 /* EZPlot.m in Sources */,
+				6628E25B1B3A1A1C00020E56 /* EZAudio.m in Sources */,
+				6628E2641B3A1A1C00020E56 /* EZAudioUtilities.m in Sources */,
+				6628E2631B3A1A1C00020E56 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

EZAudioExamples/OSX/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/Base.lproj/MainMenu.xib

@@ -1,17 +1,100 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4439" systemVersion="13A451" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4439"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
             <connections>
+                <action selector="orderFrontStandardAboutPanel:" destination="58" id="142"/>
                 <outlet property="delegate" destination="494" id="495"/>
             </connections>
         </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder">
+            <connections>
+                <action selector="alignCenter:" destination="499" id="518"/>
+                <action selector="alignJustified:" destination="500" id="523"/>
+                <action selector="alignLeft:" destination="498" id="524"/>
+                <action selector="alignRight:" destination="501" id="521"/>
+                <action selector="arrangeInFront:" destination="5" id="39"/>
+                <action selector="capitalizeWord:" destination="466" id="467"/>
+                <action selector="centerSelectionInVisibleArea:" destination="210" id="245"/>
+                <action selector="checkSpelling:" destination="201" id="225"/>
+                <action selector="clearRecentDocuments:" destination="126" id="127"/>
+                <action selector="copy:" destination="197" id="224"/>
+                <action selector="copyFont:" destination="403" id="428"/>
+                <action selector="copyRuler:" destination="506" id="522"/>
+                <action selector="cut:" destination="199" id="228"/>
+                <action selector="delete:" destination="202" id="235"/>
+                <action selector="hide:" destination="134" id="367"/>
+                <action selector="hideOtherApplications:" destination="145" id="368"/>
+                <action selector="loosenKerning:" destination="419" id="435"/>
+                <action selector="lowerBaseline:" destination="410" id="427"/>
+                <action selector="lowercaseWord:" destination="465" id="468"/>
+                <action selector="makeBaseWritingDirectionLeftToRight:" destination="511" id="526"/>
+                <action selector="makeBaseWritingDirectionNatural:" destination="510" id="525"/>
+                <action selector="makeBaseWritingDirectionRightToLeft:" destination="512" id="527"/>
+                <action selector="makeTextWritingDirectionLeftToRight:" destination="516" id="529"/>
+                <action selector="makeTextWritingDirectionNatural:" destination="515" id="528"/>
+                <action selector="makeTextWritingDirectionRightToLeft:" destination="517" id="530"/>
+                <action selector="newDocument:" destination="82" id="373"/>
+                <action selector="openDocument:" destination="72" id="374"/>
+                <action selector="orderFrontColorPanel:" destination="401" id="433"/>
+                <action selector="orderFrontSubstitutionsPanel:" destination="457" id="458"/>
+                <action selector="paste:" destination="203" id="226"/>
+                <action selector="pasteAsPlainText:" destination="485" id="486"/>
+                <action selector="pasteFont:" destination="404" id="436"/>
+                <action selector="pasteRuler:" destination="507" id="519"/>
+                <action selector="performClose:" destination="73" id="193"/>
+                <action selector="performFindPanelAction:" destination="209" id="241"/>
+                <action selector="performFindPanelAction:" destination="208" id="487"/>
+                <action selector="performFindPanelAction:" destination="213" id="488"/>
+                <action selector="performFindPanelAction:" destination="221" id="489"/>
+                <action selector="performFindPanelAction:" destination="534" id="535"/>
+                <action selector="performMiniaturize:" destination="23" id="37"/>
+                <action selector="performZoom:" destination="239" id="240"/>
+                <action selector="print:" destination="78" id="86"/>
+                <action selector="raiseBaseline:" destination="409" id="426"/>
+                <action selector="redo:" destination="215" id="231"/>
+                <action selector="revertDocumentToSaved:" destination="112" id="364"/>
+                <action selector="runPageLayout:" destination="77" id="87"/>
+                <action selector="runToolbarCustomizationPalette:" destination="298" id="365"/>
+                <action selector="saveDocument:" destination="75" id="362"/>
+                <action selector="selectAll:" destination="198" id="232"/>
+                <action selector="showGuessPanel:" destination="204" id="230"/>
+                <action selector="showHelp:" destination="492" id="493"/>
+                <action selector="startSpeaking:" destination="196" id="233"/>
+                <action selector="stopSpeaking:" destination="195" id="227"/>
+                <action selector="subscript:" destination="408" id="429"/>
+                <action selector="superscript:" destination="407" id="430"/>
+                <action selector="tightenKerning:" destination="418" id="431"/>
+                <action selector="toggleAutomaticDashSubstitution:" destination="460" id="461"/>
+                <action selector="toggleAutomaticLinkDetection:" destination="354" id="357"/>
+                <action selector="toggleAutomaticQuoteSubstitution:" destination="351" id="356"/>
+                <action selector="toggleAutomaticSpellingCorrection:" destination="454" id="456"/>
+                <action selector="toggleAutomaticTextReplacement:" destination="462" id="463"/>
+                <action selector="toggleContinuousSpellChecking:" destination="219" id="222"/>
+                <action selector="toggleGrammarChecking:" destination="346" id="347"/>
+                <action selector="toggleRuler:" destination="505" id="520"/>
+                <action selector="toggleSmartInsertDelete:" destination="350" id="355"/>
+                <action selector="toggleToolbarShown:" destination="297" id="366"/>
+                <action selector="turnOffKerning:" destination="417" id="441"/>
+                <action selector="turnOffLigatures:" destination="413" id="440"/>
+                <action selector="underline:" destination="392" id="432"/>
+                <action selector="undo:" destination="207" id="223"/>
+                <action selector="unhideAllApplications:" destination="150" id="370"/>
+                <action selector="unscript:" destination="406" id="437"/>
+                <action selector="uppercaseWord:" destination="452" id="464"/>
+                <action selector="useAllLigatures:" destination="414" id="434"/>
+                <action selector="useStandardKerning:" destination="416" id="438"/>
+                <action selector="useStandardLigatures:" destination="412" id="439"/>
+            </connections>
+        </customObject>
+        <customObject id="-3" userLabel="Application">
+            <connections>
+                <action selector="terminate:" destination="136" id="449"/>
+            </connections>
+        </customObject>
         <menu title="AMainMenu" systemMenu="main" id="29">
             <items>
                 <menuItem title="EZAudioWaveformFromFileExample" id="56">
@@ -19,9 +102,6 @@
                         <items>
                             <menuItem title="About EZAudioWaveformFromFileExample" id="58">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="236">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
@@ -36,211 +116,95 @@
                             <menuItem isSeparatorItem="YES" id="144">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Hide EZAudioWaveformFromFileExample" keyEquivalent="h" id="134">
-                                <connections>
-                                    <action selector="hide:" target="-1" id="367"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Hide EZAudioWaveformFromFileExample" keyEquivalent="h" id="134"/>
                             <menuItem title="Hide Others" keyEquivalent="h" id="145">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Show All" id="150">
-                                <connections>
-                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Show All" id="150"/>
                             <menuItem isSeparatorItem="YES" id="149">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Quit EZAudioWaveformFromFileExample" keyEquivalent="q" id="136">
-                                <connections>
-                                    <action selector="terminate:" target="-3" id="449"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Quit EZAudioWaveformFromFileExample" keyEquivalent="q" id="136"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="File" id="83">
                     <menu key="submenu" title="File" id="81">
                         <items>
-                            <menuItem title="New" keyEquivalent="n" id="82">
-                                <connections>
-                                    <action selector="newDocument:" target="-1" id="373"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Open…" keyEquivalent="o" id="72">
-                                <connections>
-                                    <action selector="openDocument:" target="-1" id="374"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="New" keyEquivalent="n" id="82"/>
+                            <menuItem title="Open…" keyEquivalent="o" id="72"/>
                             <menuItem title="Open Recent" id="124">
                                 <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
                                     <items>
-                                        <menuItem title="Clear Menu" id="126">
-                                            <connections>
-                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Clear Menu" id="126"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="79">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Close" keyEquivalent="w" id="73">
-                                <connections>
-                                    <action selector="performClose:" target="-1" id="193"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Save…" keyEquivalent="s" id="75">
-                                <connections>
-                                    <action selector="saveDocument:" target="-1" id="362"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73"/>
+                            <menuItem title="Save…" keyEquivalent="s" id="75"/>
                             <menuItem title="Revert to Saved" id="112">
                                 <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="revertDocumentToSaved:" target="-1" id="364"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="74">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Page Setup..." keyEquivalent="P" id="77">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="runPageLayout:" target="-1" id="87"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Print…" keyEquivalent="p" id="78">
-                                <connections>
-                                    <action selector="print:" target="-1" id="86"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="78"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Edit" id="217">
                     <menu key="submenu" title="Edit" id="205">
                         <items>
-                            <menuItem title="Undo" keyEquivalent="z" id="207">
-                                <connections>
-                                    <action selector="undo:" target="-1" id="223"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Undo" keyEquivalent="z" id="207"/>
                             <menuItem title="Redo" keyEquivalent="Z" id="215">
                                 <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                <connections>
-                                    <action selector="redo:" target="-1" id="231"/>
-                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="206">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Cut" keyEquivalent="x" id="199">
-                                <connections>
-                                    <action selector="cut:" target="-1" id="228"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Copy" keyEquivalent="c" id="197">
-                                <connections>
-                                    <action selector="copy:" target="-1" id="224"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Paste" keyEquivalent="v" id="203">
-                                <connections>
-                                    <action selector="paste:" target="-1" id="226"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="199"/>
+                            <menuItem title="Copy" keyEquivalent="c" id="197"/>
+                            <menuItem title="Paste" keyEquivalent="v" id="203"/>
                             <menuItem title="Paste and Match Style" keyEquivalent="V" id="485">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="pasteAsPlainText:" target="-1" id="486"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Delete" id="202">
-                                <connections>
-                                    <action selector="delete:" target="-1" id="235"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Select All" keyEquivalent="a" id="198">
-                                <connections>
-                                    <action selector="selectAll:" target="-1" id="232"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Delete" id="202"/>
+                            <menuItem title="Select All" keyEquivalent="a" id="198"/>
                             <menuItem isSeparatorItem="YES" id="214">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
                             <menuItem title="Find" id="218">
                                 <menu key="submenu" title="Find" id="220">
                                     <items>
-                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="241"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209"/>
                                         <menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="534">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="535"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="487"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208"/>
                                         <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="213">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="488"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221">
-                                            <connections>
-                                                <action selector="performFindPanelAction:" target="-1" id="489"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210">
-                                            <connections>
-                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221"/>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210"/>
                                     </items>
                                 </menu>
                             </menuItem>
                             <menuItem title="Spelling and Grammar" id="216">
                                 <menu key="submenu" title="Spelling and Grammar" id="200">
                                     <items>
-                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204">
-                                            <connections>
-                                                <action selector="showGuessPanel:" target="-1" id="230"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201">
-                                            <connections>
-                                                <action selector="checkSpelling:" target="-1" id="225"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="204"/>
+                                        <menuItem title="Check Document Now" keyEquivalent=";" id="201"/>
                                         <menuItem isSeparatorItem="YES" id="453"/>
-                                        <menuItem title="Check Spelling While Typing" id="219">
-                                            <connections>
-                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="222"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Check Grammar With Spelling" id="346">
-                                            <connections>
-                                                <action selector="toggleGrammarChecking:" target="-1" id="347"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Check Spelling While Typing" id="219"/>
+                                        <menuItem title="Check Grammar With Spelling" id="346"/>
                                         <menuItem title="Correct Spelling Automatically" id="454">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticSpellingCorrection:" target="-1" id="456"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -250,38 +214,18 @@
                                     <items>
                                         <menuItem title="Show Substitutions" id="457">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="orderFrontSubstitutionsPanel:" target="-1" id="458"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="459"/>
-                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350">
-                                            <connections>
-                                                <action selector="toggleSmartInsertDelete:" target="-1" id="355"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351">
-                                            <connections>
-                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="356"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350"/>
+                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351"/>
                                         <menuItem title="Smart Dashes" id="460">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticDashSubstitution:" target="-1" id="461"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Smart Links" tag="3" keyEquivalent="G" id="354">
                                             <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="357"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Text Replacement" id="462">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleAutomaticTextReplacement:" target="-1" id="463"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -292,21 +236,12 @@
                                     <items>
                                         <menuItem title="Make Upper Case" id="452">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="uppercaseWord:" target="-1" id="464"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Make Lower Case" id="465">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="lowercaseWord:" target="-1" id="468"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Capitalize" id="466">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="capitalizeWord:" target="-1" id="467"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -314,16 +249,8 @@
                             <menuItem title="Speech" id="211">
                                 <menu key="submenu" title="Speech" id="212">
                                     <items>
-                                        <menuItem title="Start Speaking" id="196">
-                                            <connections>
-                                                <action selector="startSpeaking:" target="-1" id="233"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Stop Speaking" id="195">
-                                            <connections>
-                                                <action selector="stopSpeaking:" target="-1" id="227"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Start Speaking" id="196"/>
+                                        <menuItem title="Stop Speaking" id="195"/>
                                     </items>
                                 </menu>
                             </menuItem>
@@ -338,37 +265,13 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Font" systemMenu="font" id="388">
                                     <items>
-                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389">
-                                            <connections>
-                                                <action selector="orderFrontFontPanel:" target="420" id="424"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="421"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391">
-                                            <connections>
-                                                <action selector="addFontTrait:" target="420" id="422"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Underline" keyEquivalent="u" id="392">
-                                            <connections>
-                                                <action selector="underline:" target="-1" id="432"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389"/>
+                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390"/>
+                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391"/>
+                                        <menuItem title="Underline" keyEquivalent="u" id="392"/>
                                         <menuItem isSeparatorItem="YES" id="393"/>
-                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="425"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395">
-                                            <connections>
-                                                <action selector="modifyFont:" target="420" id="423"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394"/>
+                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395"/>
                                         <menuItem isSeparatorItem="YES" id="396"/>
                                         <menuItem title="Kern" id="397">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -376,27 +279,15 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="416">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardKerning:" target="-1" id="438"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="417">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffKerning:" target="-1" id="441"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Tighten" id="418">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="tightenKerning:" target="-1" id="431"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Loosen" id="419">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="loosenKerning:" target="-1" id="435"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -407,21 +298,12 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="412">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useStandardLigatures:" target="-1" id="439"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use None" id="413">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="turnOffLigatures:" target="-1" id="440"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Use All" id="414">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="useAllLigatures:" target="-1" id="434"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -432,55 +314,30 @@
                                                 <items>
                                                     <menuItem title="Use Default" id="406">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="unscript:" target="-1" id="437"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Superscript" id="407">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="superscript:" target="-1" id="430"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Subscript" id="408">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="subscript:" target="-1" id="429"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Raise" id="409">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="raiseBaseline:" target="-1" id="426"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem title="Lower" id="410">
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="lowerBaseline:" target="-1" id="427"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="400"/>
-                                        <menuItem title="Show Colors" keyEquivalent="C" id="401">
-                                            <connections>
-                                                <action selector="orderFrontColorPanel:" target="-1" id="433"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Show Colors" keyEquivalent="C" id="401"/>
                                         <menuItem isSeparatorItem="YES" id="402"/>
                                         <menuItem title="Copy Style" keyEquivalent="c" id="403">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyFont:" target="-1" id="428"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Style" keyEquivalent="v" id="404">
                                             <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteFont:" target="-1" id="436"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -489,27 +346,12 @@
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <menu key="submenu" title="Text" id="497">
                                     <items>
-                                        <menuItem title="Align Left" keyEquivalent="{" id="498">
-                                            <connections>
-                                                <action selector="alignLeft:" target="-1" id="524"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Center" keyEquivalent="|" id="499">
-                                            <connections>
-                                                <action selector="alignCenter:" target="-1" id="518"/>
-                                            </connections>
-                                        </menuItem>
+                                        <menuItem title="Align Left" keyEquivalent="{" id="498"/>
+                                        <menuItem title="Center" keyEquivalent="|" id="499"/>
                                         <menuItem title="Justify" id="500">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="alignJustified:" target="-1" id="523"/>
-                                            </connections>
-                                        </menuItem>
-                                        <menuItem title="Align Right" keyEquivalent="}" id="501">
-                                            <connections>
-                                                <action selector="alignRight:" target="-1" id="521"/>
-                                            </connections>
                                         </menuItem>
+                                        <menuItem title="Align Right" keyEquivalent="}" id="501"/>
                                         <menuItem isSeparatorItem="YES" id="502"/>
                                         <menuItem title="Writing Direction" id="503">
                                             <modifierMask key="keyEquivalentModifierMask"/>
@@ -521,23 +363,14 @@
                                                     <menuItem id="510">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionNatural:" target="-1" id="525"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="511">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionLeftToRight:" target="-1" id="526"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="512">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeBaseWritingDirectionRightToLeft:" target="-1" id="527"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem isSeparatorItem="YES" id="513"/>
                                                     <menuItem title="Selection" enabled="NO" id="514">
@@ -546,23 +379,14 @@
                                                     <menuItem id="515">
                                                         <string key="title">	Default</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionNatural:" target="-1" id="528"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="516">
                                                         <string key="title">	Left to Right</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionLeftToRight:" target="-1" id="529"/>
-                                                        </connections>
                                                     </menuItem>
                                                     <menuItem id="517">
                                                         <string key="title">	Right to Left</string>
                                                         <modifierMask key="keyEquivalentModifierMask"/>
-                                                        <connections>
-                                                            <action selector="makeTextWritingDirectionRightToLeft:" target="-1" id="530"/>
-                                                        </connections>
                                                     </menuItem>
                                                 </items>
                                             </menu>
@@ -570,21 +394,12 @@
                                         <menuItem isSeparatorItem="YES" id="504"/>
                                         <menuItem title="Show Ruler" id="505">
                                             <modifierMask key="keyEquivalentModifierMask"/>
-                                            <connections>
-                                                <action selector="toggleRuler:" target="-1" id="520"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Copy Ruler" keyEquivalent="c" id="506">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="copyRuler:" target="-1" id="522"/>
-                                            </connections>
                                         </menuItem>
                                         <menuItem title="Paste Ruler" keyEquivalent="v" id="507">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-                                            <connections>
-                                                <action selector="pasteRuler:" target="-1" id="519"/>
-                                            </connections>
                                         </menuItem>
                                     </items>
                                 </menu>
@@ -597,39 +412,20 @@
                         <items>
                             <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
-                                <connections>
-                                    <action selector="toggleToolbarShown:" target="-1" id="366"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Customize Toolbar…" id="298">
-                                <connections>
-                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="365"/>
-                                </connections>
                             </menuItem>
+                            <menuItem title="Customize Toolbar…" id="298"/>
                         </items>
                     </menu>
                 </menuItem>
                 <menuItem title="Window" id="19">
                     <menu key="submenu" title="Window" systemMenu="window" id="24">
                         <items>
-                            <menuItem title="Minimize" keyEquivalent="m" id="23">
-                                <connections>
-                                    <action selector="performMiniaturize:" target="-1" id="37"/>
-                                </connections>
-                            </menuItem>
-                            <menuItem title="Zoom" id="239">
-                                <connections>
-                                    <action selector="performZoom:" target="-1" id="240"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23"/>
+                            <menuItem title="Zoom" id="239"/>
                             <menuItem isSeparatorItem="YES" id="92">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Bring All to Front" id="5">
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="39"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5"/>
                         </items>
                     </menu>
                 </menuItem>
@@ -637,21 +433,17 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Help" systemMenu="help" id="491">
                         <items>
-                            <menuItem title="EZAudioWaveformFromFileExample Help" keyEquivalent="?" id="492">
-                                <connections>
-                                    <action selector="showHelp:" target="-1" id="493"/>
-                                </connections>
-                            </menuItem>
+                            <menuItem title="EZAudioWaveformFromFileExample Help" keyEquivalent="?" id="492"/>
                         </items>
                     </menu>
                 </menuItem>
             </items>
         </menu>
         <window title="EZAudioWaveformFromFileExample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="480" height="360"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
             <view key="contentView" id="372">
                 <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -662,6 +454,14 @@
                 <outlet property="window" destination="371" id="532"/>
             </connections>
         </customObject>
-        <customObject id="420" customClass="NSFontManager"/>
+        <customObject id="420" customClass="NSFontManager">
+            <connections>
+                <action selector="addFontTrait:" destination="390" id="421"/>
+                <action selector="addFontTrait:" destination="391" id="422"/>
+                <action selector="modifyFont:" destination="395" id="423"/>
+                <action selector="modifyFont:" destination="394" id="425"/>
+                <action selector="orderFrontFontPanel:" destination="389" id="424"/>
+            </connections>
+        </customObject>
     </objects>
 </document>

EZAudioExamples/OSX/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/WaveformFromFileViewController.m

@@ -34,34 +34,19 @@
 -(void)awakeFromNib
 {
     //
-    // Customizing the audio plot's look
+    //Customizing the audio plot's look
     //
-    
     // Background color
     self.audioPlot.backgroundColor = [NSColor colorWithCalibratedRed: 0.169 green: 0.643 blue: 0.675 alpha: 1];
-    
     // Waveform color
     self.audioPlot.color           = [NSColor colorWithCalibratedRed: 1.000 green: 1.000 blue: 1.000 alpha: 1];
-    
     // Plot type
     self.audioPlot.plotType        = EZPlotTypeBuffer;
-    
     // Fill
     self.audioPlot.shouldFill      = YES;
-    
     // Mirror
     self.audioPlot.shouldMirror    = YES;
     
-    // Don't optimze for real-time because we don't need to re-render
-    // the view 60 frames per second
-    self.audioPlot.shouldOptimizeForRealtimePlot = NO;
-    
-    // Customize the layer with a shadow for fun
-    self.audioPlot.waveformLayer.shadowOffset = CGSizeMake(0.0, -1.0);
-    self.audioPlot.waveformLayer.shadowRadius = 0.0;
-    self.audioPlot.waveformLayer.shadowColor = [NSColor colorWithCalibratedRed: 0.069 green: 0.543 blue: 0.575 alpha: 1].CGColor;
-    self.audioPlot.waveformLayer.shadowOpacity = 1.0;
-    
     //
     // Open the default file included with the example
     //
@@ -115,20 +100,15 @@
     self.audioPlot.plotType     = EZPlotTypeBuffer;
     self.audioPlot.shouldFill   = YES;
     self.audioPlot.shouldMirror = YES;
-    [CATransaction begin];
-    [CATransaction setAnimationDuration:0.11f];
-    [self.audioPlot clear];
-    [CATransaction commit];
     
     //
     // Plot the whole waveform
     //
     __weak typeof (self) weakSelf = self;
-    [self.audioFile getWaveformDataWithNumberOfPoints:1024
-                                           completion:^(float **waveformData,
-                                                        int length)
+    [self.audioFile getWaveformDataWithCompletionBlock:^(float *waveformData,
+                                                         UInt32 length)
     {
-        [weakSelf.audioPlot updateBuffer:waveformData[0]
+        [weakSelf.audioPlot updateBuffer:waveformData
                           withBufferSize:length];
     }];
 }

EZAudioExamples/OSX/EZAudioWaveformFromFileExample/EZAudioWaveformFromFileExample/WaveformFromFileViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="WaveformFromFileViewController">
@@ -14,81 +14,58 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView wantsLayer="YES" id="0tP-1Y-eJu">
+        <customView id="0tP-1Y-eJu">
             <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="gA7-R7-vbt" customClass="EZAudioPlot">
-                    <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
-                    <subviews>
-                        <box autoresizesSubviews="NO" title="Box" boxType="custom" borderType="none" translatesAutoresizingMaskIntoConstraints="NO" id="dH6-TL-MVT">
-                            <rect key="frame" x="0.0" y="193" width="480" height="79"/>
-                            <view key="contentView">
-                                <rect key="frame" x="0.0" y="0.0" width="480" height="79"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xHD-WQ-u4W">
-                                        <rect key="frame" x="10" y="11" width="125" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="113" id="b31-eU-mqu"/>
-                                        </constraints>
-                                        <buttonCell key="cell" type="push" title="Choose File..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7er-Dd-Gmx">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="openFile:" target="-2" id="oIG-3z-prU"/>
-                                        </connections>
-                                    </button>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zS7-9z-YB1">
-                                        <rect key="frame" x="137" y="22" width="213" height="17"/>
-                                        <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="Label" id="jWL-Kx-s9B">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Q5-5T-qQ4">
-                                        <rect key="frame" x="371" y="11" width="97" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="85" id="Xin-4w-yLk"/>
-                                        </constraints>
-                                        <buttonCell key="cell" type="push" title="Snapshot" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8ht-Cu-65q">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="snapshot:" target="-2" id="RLS-Qr-Gbu"/>
-                                        </connections>
-                                    </button>
-                                </subviews>
-                            </view>
-                            <constraints>
-                                <constraint firstItem="zS7-9z-YB1" firstAttribute="leading" secondItem="xHD-WQ-u4W" secondAttribute="trailing" constant="10" id="7yh-7q-axR"/>
-                                <constraint firstItem="2Q5-5T-qQ4" firstAttribute="leading" secondItem="zS7-9z-YB1" secondAttribute="trailing" constant="29" id="D3d-Ou-qaP"/>
-                                <constraint firstAttribute="trailing" secondItem="2Q5-5T-qQ4" secondAttribute="trailing" constant="18" id="D9F-H4-mlu"/>
-                                <constraint firstItem="zS7-9z-YB1" firstAttribute="top" secondItem="2Q5-5T-qQ4" secondAttribute="top" id="E0b-6r-tgF"/>
-                                <constraint firstItem="xHD-WQ-u4W" firstAttribute="leading" secondItem="dH6-TL-MVT" secondAttribute="leading" constant="16" id="Ieb-er-Yqf"/>
-                                <constraint firstItem="2Q5-5T-qQ4" firstAttribute="centerY" secondItem="dH6-TL-MVT" secondAttribute="centerY" constant="11" id="TG9-81-0jp"/>
-                                <constraint firstItem="xHD-WQ-u4W" firstAttribute="top" secondItem="dH6-TL-MVT" secondAttribute="top" constant="40" id="aDV-Ry-Inv"/>
-                                <constraint firstItem="2Q5-5T-qQ4" firstAttribute="baseline" secondItem="xHD-WQ-u4W" secondAttribute="baseline" id="yAV-WB-sKN"/>
-                            </constraints>
-                            <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                            <color key="fillColor" red="0.0" green="0.0" blue="0.0" alpha="0.69999999999999996" colorSpace="calibratedRGB"/>
-                        </box>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="dH6-TL-MVT" firstAttribute="leading" secondItem="gA7-R7-vbt" secondAttribute="leading" id="JWF-3n-y1m"/>
-                        <constraint firstAttribute="trailing" secondItem="dH6-TL-MVT" secondAttribute="trailing" id="c6J-c1-evB"/>
-                        <constraint firstItem="dH6-TL-MVT" firstAttribute="top" secondItem="gA7-R7-vbt" secondAttribute="top" id="yIc-KE-eyZ"/>
-                    </constraints>
+                    <rect key="frame" x="0.0" y="0.0" width="480" height="211"/>
                 </customView>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xHD-WQ-u4W">
+                    <rect key="frame" x="14" y="224" width="125" height="32"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="113" id="0jv-eA-dSV"/>
+                        <constraint firstAttribute="height" constant="21" id="1Yn-bF-mfb"/>
+                    </constraints>
+                    <buttonCell key="cell" type="push" title="Choose File..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7er-Dd-Gmx">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="openFile:" target="-2" id="oIG-3z-prU"/>
+                    </connections>
+                </button>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zS7-9z-YB1">
+                    <rect key="frame" x="141" y="235" width="213" height="17"/>
+                    <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" title="Label" id="jWL-Kx-s9B">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Q5-5T-qQ4">
+                    <rect key="frame" x="375" y="224" width="97" height="32"/>
+                    <buttonCell key="cell" type="push" title="Snapshot" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8ht-Cu-65q">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="snapshot:" target="-2" id="RLS-Qr-Gbu"/>
+                    </connections>
+                </button>
             </subviews>
             <constraints>
-                <constraint firstItem="gA7-R7-vbt" firstAttribute="leading" secondItem="0tP-1Y-eJu" secondAttribute="leading" id="1uQ-PM-GXF"/>
-                <constraint firstAttribute="trailing" secondItem="gA7-R7-vbt" secondAttribute="trailing" id="w4s-bY-9Vz"/>
-                <constraint firstItem="gA7-R7-vbt" firstAttribute="top" secondItem="0tP-1Y-eJu" secondAttribute="top" id="wko-ZW-xTr"/>
-                <constraint firstAttribute="bottom" secondItem="gA7-R7-vbt" secondAttribute="bottom" id="ynB-p6-1In"/>
+                <constraint firstItem="zS7-9z-YB1" firstAttribute="leading" secondItem="xHD-WQ-u4W" secondAttribute="trailing" constant="10" id="4RW-fI-JJs"/>
+                <constraint firstItem="2Q5-5T-qQ4" firstAttribute="top" secondItem="0tP-1Y-eJu" secondAttribute="top" constant="20" id="E3b-p3-BoQ"/>
+                <constraint firstAttribute="trailing" relation="lessThanOrEqual" secondItem="zS7-9z-YB1" secondAttribute="trailing" constant="20" id="NTC-UB-Fma"/>
+                <constraint firstAttribute="trailing" secondItem="gA7-R7-vbt" secondAttribute="trailing" id="Tsg-V9-2HL"/>
+                <constraint firstItem="gA7-R7-vbt" firstAttribute="leading" secondItem="0tP-1Y-eJu" secondAttribute="leading" id="WAi-gw-Gx4"/>
+                <constraint firstItem="gA7-R7-vbt" firstAttribute="top" secondItem="xHD-WQ-u4W" secondAttribute="bottom" constant="20" id="fLd-J2-pdv"/>
+                <constraint firstItem="zS7-9z-YB1" firstAttribute="top" secondItem="0tP-1Y-eJu" secondAttribute="top" constant="20" id="gjc-Xh-3J0"/>
+                <constraint firstItem="xHD-WQ-u4W" firstAttribute="leading" secondItem="0tP-1Y-eJu" secondAttribute="leading" constant="20" id="ide-qF-Q25"/>
+                <constraint firstItem="xHD-WQ-u4W" firstAttribute="top" secondItem="0tP-1Y-eJu" secondAttribute="top" constant="20" id="iiM-ji-9ME"/>
+                <constraint firstAttribute="trailing" secondItem="2Q5-5T-qQ4" secondAttribute="trailing" constant="14" id="j3N-CF-2Rt"/>
+                <constraint firstAttribute="bottom" secondItem="gA7-R7-vbt" secondAttribute="bottom" id="nf1-Zn-U5V"/>
             </constraints>
         </customView>
     </objects>

EZAudioExamples/iOS/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample.xcodeproj/project.pbxproj

@@ -7,23 +7,24 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		667558A21B3B604B0013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675587F1B3B604B0013E67E /* EZAudio.m */; };
-		667558A31B3B604B0013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558811B3B604B0013E67E /* EZAudioDevice.m */; };
-		667558A41B3B604B0013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558831B3B604B0013E67E /* EZAudioDisplayLink.m */; };
-		667558A51B3B604B0013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558851B3B604B0013E67E /* EZAudioFile.m */; };
-		667558A61B3B604B0013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558871B3B604B0013E67E /* EZAudioFloatConverter.m */; };
-		667558A71B3B604B0013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558891B3B604B0013E67E /* EZAudioFloatData.m */; };
-		667558A81B3B604B0013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675588B1B3B604B0013E67E /* EZAudioPlayer.m */; };
-		667558A91B3B604B0013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675588D1B3B604B0013E67E /* EZAudioPlot.m */; };
-		667558AA1B3B604B0013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675588F1B3B604B0013E67E /* EZAudioPlotGL.m */; };
-		667558AC1B3B604B0013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558931B3B604B0013E67E /* EZAudioUtilities.m */; };
-		667558AD1B3B604B0013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558951B3B604B0013E67E /* EZMicrophone.m */; };
-		667558AE1B3B604B0013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558971B3B604B0013E67E /* EZOutput.m */; };
-		667558AF1B3B604B0013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558991B3B604B0013E67E /* EZPlot.m */; };
-		667558B01B3B604B0013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675589B1B3B604B0013E67E /* EZRecorder.m */; };
-		667558B11B3B604B0013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6675589C1B3B604B0013E67E /* TPCircularBuffer.c */; };
-		667558B21B3B604B0013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6675589F1B3B604B0013E67E /* CHANGELOG */; };
-		667558B31B3B604B0013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 667558A01B3B604B0013E67E /* VERSION */; };
+		6628E0D41B39D8CB00020E56 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0B21B39D8CB00020E56 /* AEFloatConverter.m */; };
+		6628E0D51B39D8CB00020E56 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0B41B39D8CB00020E56 /* EZAudio.m */; };
+		6628E0D61B39D8CB00020E56 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0B61B39D8CB00020E56 /* EZAudioDevice.m */; };
+		6628E0D71B39D8CB00020E56 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0B81B39D8CB00020E56 /* EZAudioFile.m */; };
+		6628E0D81B39D8CB00020E56 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0BA1B39D8CB00020E56 /* EZAudioFloatConverter.m */; };
+		6628E0D91B39D8CB00020E56 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0BC1B39D8CB00020E56 /* EZAudioFloatData.m */; };
+		6628E0DA1B39D8CB00020E56 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0BE1B39D8CB00020E56 /* EZAudioPlayer.m */; };
+		6628E0DB1B39D8CB00020E56 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0C01B39D8CB00020E56 /* EZAudioPlot.m */; };
+		6628E0DC1B39D8CB00020E56 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0C21B39D8CB00020E56 /* EZAudioPlotGL.m */; };
+		6628E0DD1B39D8CB00020E56 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0C41B39D8CB00020E56 /* EZAudioPlotGLKViewController.m */; };
+		6628E0DE1B39D8CB00020E56 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0C61B39D8CB00020E56 /* EZAudioUtilities.m */; };
+		6628E0DF1B39D8CB00020E56 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0C81B39D8CB00020E56 /* EZMicrophone.m */; };
+		6628E0E01B39D8CB00020E56 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0CA1B39D8CB00020E56 /* EZOutput.m */; };
+		6628E0E11B39D8CB00020E56 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0CC1B39D8CB00020E56 /* EZPlot.m */; };
+		6628E0E21B39D8CB00020E56 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0CE1B39D8CB00020E56 /* EZRecorder.m */; };
+		6628E0E31B39D8CB00020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0CF1B39D8CB00020E56 /* TPCircularBuffer.c */; };
+		6628E0E41B39D8CB00020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E0D21B39D8CB00020E56 /* CHANGELOG */; };
+		6628E0E51B39D8CB00020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E0D31B39D8CB00020E56 /* VERSION */; };
 		66DB85831B0430E70018EFC5 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 66DB85821B0430E70018EFC5 /* MainStoryboard.storyboard */; };
 		94056F7E185E593500EB94BA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94056F7D185E593500EB94BA /* Foundation.framework */; };
 		94056F80185E593500EB94BA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94056F7F185E593500EB94BA /* CoreGraphics.framework */; };
@@ -54,38 +55,40 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		6675587E1B3B604B0013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		6675587F1B3B604B0013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		667558801B3B604B0013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		667558811B3B604B0013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		667558821B3B604B0013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		667558831B3B604B0013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		667558841B3B604B0013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		667558851B3B604B0013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		667558861B3B604B0013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		667558871B3B604B0013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		667558881B3B604B0013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		667558891B3B604B0013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		6675588A1B3B604B0013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		6675588B1B3B604B0013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		6675588C1B3B604B0013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		6675588D1B3B604B0013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		6675588E1B3B604B0013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		6675588F1B3B604B0013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		667558921B3B604B0013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		667558931B3B604B0013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		667558941B3B604B0013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		667558951B3B604B0013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		667558961B3B604B0013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		667558971B3B604B0013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		667558981B3B604B0013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		667558991B3B604B0013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		6675589A1B3B604B0013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		6675589B1B3B604B0013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		6675589C1B3B604B0013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		6675589D1B3B604B0013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		6675589F1B3B604B0013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		667558A01B3B604B0013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E0B11B39D8CB00020E56 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		6628E0B21B39D8CB00020E56 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		6628E0B31B39D8CB00020E56 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		6628E0B41B39D8CB00020E56 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		6628E0B51B39D8CB00020E56 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		6628E0B61B39D8CB00020E56 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		6628E0B71B39D8CB00020E56 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		6628E0B81B39D8CB00020E56 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		6628E0B91B39D8CB00020E56 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		6628E0BA1B39D8CB00020E56 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		6628E0BB1B39D8CB00020E56 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		6628E0BC1B39D8CB00020E56 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		6628E0BD1B39D8CB00020E56 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		6628E0BE1B39D8CB00020E56 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		6628E0BF1B39D8CB00020E56 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		6628E0C01B39D8CB00020E56 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		6628E0C11B39D8CB00020E56 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		6628E0C21B39D8CB00020E56 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		6628E0C31B39D8CB00020E56 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		6628E0C41B39D8CB00020E56 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		6628E0C51B39D8CB00020E56 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		6628E0C61B39D8CB00020E56 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		6628E0C71B39D8CB00020E56 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		6628E0C81B39D8CB00020E56 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		6628E0C91B39D8CB00020E56 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		6628E0CA1B39D8CB00020E56 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		6628E0CB1B39D8CB00020E56 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		6628E0CC1B39D8CB00020E56 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		6628E0CD1B39D8CB00020E56 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		6628E0CE1B39D8CB00020E56 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		6628E0CF1B39D8CB00020E56 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		6628E0D01B39D8CB00020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		6628E0D21B39D8CB00020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		6628E0D31B39D8CB00020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		66DB85821B0430E70018EFC5 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
 		94056F7A185E593500EB94BA /* EZAudioCoreGraphicsWaveformExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioCoreGraphicsWaveformExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		94056F7D185E593500EB94BA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -137,50 +140,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		6675587B1B3B604B0013E67E /* EZAudio */ = {
+		6628E0B01B39D8CB00020E56 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				6675587E1B3B604B0013E67E /* EZAudio.h */,
-				6675587F1B3B604B0013E67E /* EZAudio.m */,
-				667558801B3B604B0013E67E /* EZAudioDevice.h */,
-				667558811B3B604B0013E67E /* EZAudioDevice.m */,
-				667558821B3B604B0013E67E /* EZAudioDisplayLink.h */,
-				667558831B3B604B0013E67E /* EZAudioDisplayLink.m */,
-				667558841B3B604B0013E67E /* EZAudioFile.h */,
-				667558851B3B604B0013E67E /* EZAudioFile.m */,
-				667558861B3B604B0013E67E /* EZAudioFloatConverter.h */,
-				667558871B3B604B0013E67E /* EZAudioFloatConverter.m */,
-				667558881B3B604B0013E67E /* EZAudioFloatData.h */,
-				667558891B3B604B0013E67E /* EZAudioFloatData.m */,
-				6675588A1B3B604B0013E67E /* EZAudioPlayer.h */,
-				6675588B1B3B604B0013E67E /* EZAudioPlayer.m */,
-				6675588C1B3B604B0013E67E /* EZAudioPlot.h */,
-				6675588D1B3B604B0013E67E /* EZAudioPlot.m */,
-				6675588E1B3B604B0013E67E /* EZAudioPlotGL.h */,
-				6675588F1B3B604B0013E67E /* EZAudioPlotGL.m */,
-				667558921B3B604B0013E67E /* EZAudioUtilities.h */,
-				667558931B3B604B0013E67E /* EZAudioUtilities.m */,
-				667558941B3B604B0013E67E /* EZMicrophone.h */,
-				667558951B3B604B0013E67E /* EZMicrophone.m */,
-				667558961B3B604B0013E67E /* EZOutput.h */,
-				667558971B3B604B0013E67E /* EZOutput.m */,
-				667558981B3B604B0013E67E /* EZPlot.h */,
-				667558991B3B604B0013E67E /* EZPlot.m */,
-				6675589A1B3B604B0013E67E /* EZRecorder.h */,
-				6675589B1B3B604B0013E67E /* EZRecorder.m */,
-				6675589C1B3B604B0013E67E /* TPCircularBuffer.c */,
-				6675589D1B3B604B0013E67E /* TPCircularBuffer.h */,
-				6675589E1B3B604B0013E67E /* VERSION */,
+				6628E0B11B39D8CB00020E56 /* AEFloatConverter.h */,
+				6628E0B21B39D8CB00020E56 /* AEFloatConverter.m */,
+				6628E0B31B39D8CB00020E56 /* EZAudio.h */,
+				6628E0B41B39D8CB00020E56 /* EZAudio.m */,
+				6628E0B51B39D8CB00020E56 /* EZAudioDevice.h */,
+				6628E0B61B39D8CB00020E56 /* EZAudioDevice.m */,
+				6628E0B71B39D8CB00020E56 /* EZAudioFile.h */,
+				6628E0B81B39D8CB00020E56 /* EZAudioFile.m */,
+				6628E0B91B39D8CB00020E56 /* EZAudioFloatConverter.h */,
+				6628E0BA1B39D8CB00020E56 /* EZAudioFloatConverter.m */,
+				6628E0BB1B39D8CB00020E56 /* EZAudioFloatData.h */,
+				6628E0BC1B39D8CB00020E56 /* EZAudioFloatData.m */,
+				6628E0BD1B39D8CB00020E56 /* EZAudioPlayer.h */,
+				6628E0BE1B39D8CB00020E56 /* EZAudioPlayer.m */,
+				6628E0BF1B39D8CB00020E56 /* EZAudioPlot.h */,
+				6628E0C01B39D8CB00020E56 /* EZAudioPlot.m */,
+				6628E0C11B39D8CB00020E56 /* EZAudioPlotGL.h */,
+				6628E0C21B39D8CB00020E56 /* EZAudioPlotGL.m */,
+				6628E0C31B39D8CB00020E56 /* EZAudioPlotGLKViewController.h */,
+				6628E0C41B39D8CB00020E56 /* EZAudioPlotGLKViewController.m */,
+				6628E0C51B39D8CB00020E56 /* EZAudioUtilities.h */,
+				6628E0C61B39D8CB00020E56 /* EZAudioUtilities.m */,
+				6628E0C71B39D8CB00020E56 /* EZMicrophone.h */,
+				6628E0C81B39D8CB00020E56 /* EZMicrophone.m */,
+				6628E0C91B39D8CB00020E56 /* EZOutput.h */,
+				6628E0CA1B39D8CB00020E56 /* EZOutput.m */,
+				6628E0CB1B39D8CB00020E56 /* EZPlot.h */,
+				6628E0CC1B39D8CB00020E56 /* EZPlot.m */,
+				6628E0CD1B39D8CB00020E56 /* EZRecorder.h */,
+				6628E0CE1B39D8CB00020E56 /* EZRecorder.m */,
+				6628E0CF1B39D8CB00020E56 /* TPCircularBuffer.c */,
+				6628E0D01B39D8CB00020E56 /* TPCircularBuffer.h */,
+				6628E0D11B39D8CB00020E56 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		6675589E1B3B604B0013E67E /* VERSION */ = {
+		6628E0D11B39D8CB00020E56 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				6675589F1B3B604B0013E67E /* CHANGELOG */,
-				667558A01B3B604B0013E67E /* VERSION */,
+				6628E0D21B39D8CB00020E56 /* CHANGELOG */,
+				6628E0D31B39D8CB00020E56 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -221,7 +226,7 @@
 		94056F83185E593500EB94BA /* EZAudioCoreGraphicsWaveformExample */ = {
 			isa = PBXGroup;
 			children = (
-				6675587B1B3B604B0013E67E /* EZAudio */,
+				6628E0B01B39D8CB00020E56 /* EZAudio */,
 				94056F8C185E593500EB94BA /* AppDelegate.h */,
 				94056F8D185E593500EB94BA /* AppDelegate.m */,
 				66DB85821B0430E70018EFC5 /* MainStoryboard.storyboard */,
@@ -339,10 +344,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				94056F99185E593500EB94BA /* Images.xcassets in Resources */,
-				667558B21B3B604B0013E67E /* CHANGELOG in Resources */,
+				6628E0E41B39D8CB00020E56 /* CHANGELOG in Resources */,
 				66DB85831B0430E70018EFC5 /* MainStoryboard.storyboard in Resources */,
 				94056F88185E593500EB94BA /* InfoPlist.strings in Resources */,
-				667558B31B3B604B0013E67E /* VERSION in Resources */,
+				6628E0E51B39D8CB00020E56 /* VERSION in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -361,24 +366,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				667558A91B3B604B0013E67E /* EZAudioPlot.m in Sources */,
-				667558A81B3B604B0013E67E /* EZAudioPlayer.m in Sources */,
+				6628E0E21B39D8CB00020E56 /* EZRecorder.m in Sources */,
 				94056FDE185E59D900EB94BA /* CoreGraphicsWaveformViewController.m in Sources */,
-				667558AA1B3B604B0013E67E /* EZAudioPlotGL.m in Sources */,
-				667558A51B3B604B0013E67E /* EZAudioFile.m in Sources */,
-				667558AE1B3B604B0013E67E /* EZOutput.m in Sources */,
-				667558AC1B3B604B0013E67E /* EZAudioUtilities.m in Sources */,
-				667558AF1B3B604B0013E67E /* EZPlot.m in Sources */,
+				6628E0D81B39D8CB00020E56 /* EZAudioFloatConverter.m in Sources */,
+				6628E0D91B39D8CB00020E56 /* EZAudioFloatData.m in Sources */,
+				6628E0D41B39D8CB00020E56 /* AEFloatConverter.m in Sources */,
+				6628E0D71B39D8CB00020E56 /* EZAudioFile.m in Sources */,
+				6628E0E01B39D8CB00020E56 /* EZOutput.m in Sources */,
+				6628E0DC1B39D8CB00020E56 /* EZAudioPlotGL.m in Sources */,
+				6628E0E31B39D8CB00020E56 /* TPCircularBuffer.c in Sources */,
+				6628E0DB1B39D8CB00020E56 /* EZAudioPlot.m in Sources */,
 				94056F8E185E593500EB94BA /* AppDelegate.m in Sources */,
-				667558B01B3B604B0013E67E /* EZRecorder.m in Sources */,
-				667558A71B3B604B0013E67E /* EZAudioFloatData.m in Sources */,
-				667558A61B3B604B0013E67E /* EZAudioFloatConverter.m in Sources */,
-				667558A41B3B604B0013E67E /* EZAudioDisplayLink.m in Sources */,
-				667558AD1B3B604B0013E67E /* EZMicrophone.m in Sources */,
-				667558A31B3B604B0013E67E /* EZAudioDevice.m in Sources */,
+				6628E0DF1B39D8CB00020E56 /* EZMicrophone.m in Sources */,
+				6628E0DA1B39D8CB00020E56 /* EZAudioPlayer.m in Sources */,
+				6628E0D61B39D8CB00020E56 /* EZAudioDevice.m in Sources */,
 				94056F8A185E593500EB94BA /* main.m in Sources */,
-				667558B11B3B604B0013E67E /* TPCircularBuffer.c in Sources */,
-				667558A21B3B604B0013E67E /* EZAudio.m in Sources */,
+				6628E0E11B39D8CB00020E56 /* EZPlot.m in Sources */,
+				6628E0D51B39D8CB00020E56 /* EZAudio.m in Sources */,
+				6628E0DE1B39D8CB00020E56 /* EZAudioUtilities.m in Sources */,
+				6628E0DD1B39D8CB00020E56 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -497,7 +503,6 @@
 		94056FB0185E593500EB94BA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -513,7 +518,6 @@
 		94056FB1185E593500EB94BA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_IDENTITY = "iPhone Developer";

EZAudioExamples/iOS/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/AppDelegate.h

@@ -3,7 +3,7 @@
 //  EZAudioCoreGraphicsWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

EZAudioExamples/iOS/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/AppDelegate.m

@@ -3,7 +3,7 @@
 //  EZAudioCoreGraphicsWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import "AppDelegate.h"

EZAudioExamples/iOS/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/CoreGraphicsWaveformViewController.h

@@ -3,7 +3,7 @@
 //  EZAudioCoreGraphicsWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

EZAudioExamples/iOS/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/CoreGraphicsWaveformViewController.m

@@ -3,7 +3,7 @@
 //  EZAudioCoreGraphicsWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import "CoreGraphicsWaveformViewController.h"
@@ -24,7 +24,7 @@
 }
 
 //------------------------------------------------------------------------------
-#pragma mark - Setup
+#pragma mark - Customize the Audio Plot
 //------------------------------------------------------------------------------
 
 - (void)viewDidLoad

EZAudioExamples/iOS/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/MainStoryboard.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="uAJ-Uz-eFq">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="uAJ-Uz-eFq">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>

EZAudioExamples/iOS/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExample/main.m

@@ -3,7 +3,7 @@
 //  EZAudioCoreGraphicsWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

EZAudioExamples/iOS/EZAudioCoreGraphicsWaveformExample/EZAudioCoreGraphicsWaveformExampleTests/EZAudioCoreGraphicsWaveformExampleTests.m

@@ -3,7 +3,7 @@
 //  EZAudioCoreGraphicsWaveformExampleTests
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <XCTest/XCTest.h>

EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample.xcodeproj/project.pbxproj

@@ -7,24 +7,25 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6628E1401B39D96500020E56 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E11E1B39D96500020E56 /* AEFloatConverter.m */; };
+		6628E1411B39D96500020E56 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1201B39D96500020E56 /* EZAudio.m */; };
+		6628E1421B39D96500020E56 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1221B39D96500020E56 /* EZAudioDevice.m */; };
+		6628E1431B39D96500020E56 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1241B39D96500020E56 /* EZAudioFile.m */; };
+		6628E1441B39D96500020E56 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1261B39D96500020E56 /* EZAudioFloatConverter.m */; };
+		6628E1451B39D96500020E56 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1281B39D96500020E56 /* EZAudioFloatData.m */; };
+		6628E1461B39D96500020E56 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E12A1B39D96500020E56 /* EZAudioPlayer.m */; };
+		6628E1471B39D96500020E56 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E12C1B39D96500020E56 /* EZAudioPlot.m */; };
+		6628E1481B39D96500020E56 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E12E1B39D96500020E56 /* EZAudioPlotGL.m */; };
+		6628E1491B39D96500020E56 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1301B39D96500020E56 /* EZAudioPlotGLKViewController.m */; };
+		6628E14A1B39D96500020E56 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1321B39D96500020E56 /* EZAudioUtilities.m */; };
+		6628E14B1B39D96500020E56 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1341B39D96500020E56 /* EZMicrophone.m */; };
+		6628E14C1B39D96500020E56 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1361B39D96500020E56 /* EZOutput.m */; };
+		6628E14D1B39D96500020E56 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1381B39D96500020E56 /* EZPlot.m */; };
+		6628E14E1B39D96500020E56 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E13A1B39D96500020E56 /* EZRecorder.m */; };
+		6628E14F1B39D96500020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E13B1B39D96500020E56 /* TPCircularBuffer.c */; };
+		6628E1501B39D96500020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E13E1B39D96500020E56 /* CHANGELOG */; };
+		6628E1511B39D96500020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E13F1B39D96500020E56 /* VERSION */; };
 		6628E2331B39F7CC00020E56 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2321B39F7CC00020E56 /* MainStoryboard.storyboard */; };
-		667559141B3B78720013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558F11B3B78720013E67E /* EZAudio.m */; };
-		667559151B3B78720013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558F31B3B78720013E67E /* EZAudioDevice.m */; };
-		667559161B3B78720013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558F51B3B78720013E67E /* EZAudioDisplayLink.m */; };
-		667559171B3B78720013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558F71B3B78720013E67E /* EZAudioFile.m */; };
-		667559181B3B78720013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558F91B3B78720013E67E /* EZAudioFloatConverter.m */; };
-		667559191B3B78720013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558FB1B3B78720013E67E /* EZAudioFloatData.m */; };
-		6675591A1B3B78720013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558FD1B3B78720013E67E /* EZAudioPlayer.m */; };
-		6675591B1B3B78720013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558FF1B3B78720013E67E /* EZAudioPlot.m */; };
-		6675591C1B3B78720013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559011B3B78720013E67E /* EZAudioPlotGL.m */; };
-		6675591E1B3B78720013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559051B3B78720013E67E /* EZAudioUtilities.m */; };
-		6675591F1B3B78720013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559071B3B78720013E67E /* EZMicrophone.m */; };
-		667559201B3B78720013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559091B3B78720013E67E /* EZOutput.m */; };
-		667559211B3B78720013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675590B1B3B78720013E67E /* EZPlot.m */; };
-		667559221B3B78720013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675590D1B3B78720013E67E /* EZRecorder.m */; };
-		667559231B3B78720013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6675590E1B3B78720013E67E /* TPCircularBuffer.c */; };
-		667559241B3B78720013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 667559111B3B78720013E67E /* CHANGELOG */; };
-		667559251B3B78720013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 667559121B3B78720013E67E /* VERSION */; };
 		9417A96C1871E88300D9D37B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A96B1871E88300D9D37B /* Foundation.framework */; };
 		9417A96E1871E88300D9D37B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A96D1871E88300D9D37B /* CoreGraphics.framework */; };
 		9417A9701871E88300D9D37B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A96F1871E88300D9D37B /* UIKit.framework */; };
@@ -55,39 +56,41 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		6628E11D1B39D96500020E56 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		6628E11E1B39D96500020E56 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		6628E11F1B39D96500020E56 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		6628E1201B39D96500020E56 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		6628E1211B39D96500020E56 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		6628E1221B39D96500020E56 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		6628E1231B39D96500020E56 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		6628E1241B39D96500020E56 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		6628E1251B39D96500020E56 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		6628E1261B39D96500020E56 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		6628E1271B39D96500020E56 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		6628E1281B39D96500020E56 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		6628E1291B39D96500020E56 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		6628E12A1B39D96500020E56 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		6628E12B1B39D96500020E56 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		6628E12C1B39D96500020E56 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		6628E12D1B39D96500020E56 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		6628E12E1B39D96500020E56 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		6628E12F1B39D96500020E56 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		6628E1301B39D96500020E56 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		6628E1311B39D96500020E56 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		6628E1321B39D96500020E56 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		6628E1331B39D96500020E56 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		6628E1341B39D96500020E56 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		6628E1351B39D96500020E56 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		6628E1361B39D96500020E56 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		6628E1371B39D96500020E56 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		6628E1381B39D96500020E56 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		6628E1391B39D96500020E56 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		6628E13A1B39D96500020E56 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		6628E13B1B39D96500020E56 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		6628E13C1B39D96500020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		6628E13E1B39D96500020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		6628E13F1B39D96500020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		6628E2321B39F7CC00020E56 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
-		667558F01B3B78720013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		667558F11B3B78720013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		667558F21B3B78720013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		667558F31B3B78720013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		667558F41B3B78720013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		667558F51B3B78720013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		667558F61B3B78720013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		667558F71B3B78720013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		667558F81B3B78720013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		667558F91B3B78720013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		667558FA1B3B78720013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		667558FB1B3B78720013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		667558FC1B3B78720013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		667558FD1B3B78720013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		667558FE1B3B78720013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		667558FF1B3B78720013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		667559001B3B78720013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		667559011B3B78720013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		667559041B3B78720013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		667559051B3B78720013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		667559061B3B78720013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		667559071B3B78720013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		667559081B3B78720013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		667559091B3B78720013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		6675590A1B3B78720013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		6675590B1B3B78720013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		6675590C1B3B78720013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		6675590D1B3B78720013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		6675590E1B3B78720013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		6675590F1B3B78720013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		667559111B3B78720013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		667559121B3B78720013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		9417A9681871E88300D9D37B /* EZAudioFFTExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioFFTExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9417A96B1871E88300D9D37B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		9417A96D1871E88300D9D37B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -140,50 +143,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		667558ED1B3B78720013E67E /* EZAudio */ = {
+		6628E11C1B39D96500020E56 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				667558F01B3B78720013E67E /* EZAudio.h */,
-				667558F11B3B78720013E67E /* EZAudio.m */,
-				667558F21B3B78720013E67E /* EZAudioDevice.h */,
-				667558F31B3B78720013E67E /* EZAudioDevice.m */,
-				667558F41B3B78720013E67E /* EZAudioDisplayLink.h */,
-				667558F51B3B78720013E67E /* EZAudioDisplayLink.m */,
-				667558F61B3B78720013E67E /* EZAudioFile.h */,
-				667558F71B3B78720013E67E /* EZAudioFile.m */,
-				667558F81B3B78720013E67E /* EZAudioFloatConverter.h */,
-				667558F91B3B78720013E67E /* EZAudioFloatConverter.m */,
-				667558FA1B3B78720013E67E /* EZAudioFloatData.h */,
-				667558FB1B3B78720013E67E /* EZAudioFloatData.m */,
-				667558FC1B3B78720013E67E /* EZAudioPlayer.h */,
-				667558FD1B3B78720013E67E /* EZAudioPlayer.m */,
-				667558FE1B3B78720013E67E /* EZAudioPlot.h */,
-				667558FF1B3B78720013E67E /* EZAudioPlot.m */,
-				667559001B3B78720013E67E /* EZAudioPlotGL.h */,
-				667559011B3B78720013E67E /* EZAudioPlotGL.m */,
-				667559041B3B78720013E67E /* EZAudioUtilities.h */,
-				667559051B3B78720013E67E /* EZAudioUtilities.m */,
-				667559061B3B78720013E67E /* EZMicrophone.h */,
-				667559071B3B78720013E67E /* EZMicrophone.m */,
-				667559081B3B78720013E67E /* EZOutput.h */,
-				667559091B3B78720013E67E /* EZOutput.m */,
-				6675590A1B3B78720013E67E /* EZPlot.h */,
-				6675590B1B3B78720013E67E /* EZPlot.m */,
-				6675590C1B3B78720013E67E /* EZRecorder.h */,
-				6675590D1B3B78720013E67E /* EZRecorder.m */,
-				6675590E1B3B78720013E67E /* TPCircularBuffer.c */,
-				6675590F1B3B78720013E67E /* TPCircularBuffer.h */,
-				667559101B3B78720013E67E /* VERSION */,
+				6628E11D1B39D96500020E56 /* AEFloatConverter.h */,
+				6628E11E1B39D96500020E56 /* AEFloatConverter.m */,
+				6628E11F1B39D96500020E56 /* EZAudio.h */,
+				6628E1201B39D96500020E56 /* EZAudio.m */,
+				6628E1211B39D96500020E56 /* EZAudioDevice.h */,
+				6628E1221B39D96500020E56 /* EZAudioDevice.m */,
+				6628E1231B39D96500020E56 /* EZAudioFile.h */,
+				6628E1241B39D96500020E56 /* EZAudioFile.m */,
+				6628E1251B39D96500020E56 /* EZAudioFloatConverter.h */,
+				6628E1261B39D96500020E56 /* EZAudioFloatConverter.m */,
+				6628E1271B39D96500020E56 /* EZAudioFloatData.h */,
+				6628E1281B39D96500020E56 /* EZAudioFloatData.m */,
+				6628E1291B39D96500020E56 /* EZAudioPlayer.h */,
+				6628E12A1B39D96500020E56 /* EZAudioPlayer.m */,
+				6628E12B1B39D96500020E56 /* EZAudioPlot.h */,
+				6628E12C1B39D96500020E56 /* EZAudioPlot.m */,
+				6628E12D1B39D96500020E56 /* EZAudioPlotGL.h */,
+				6628E12E1B39D96500020E56 /* EZAudioPlotGL.m */,
+				6628E12F1B39D96500020E56 /* EZAudioPlotGLKViewController.h */,
+				6628E1301B39D96500020E56 /* EZAudioPlotGLKViewController.m */,
+				6628E1311B39D96500020E56 /* EZAudioUtilities.h */,
+				6628E1321B39D96500020E56 /* EZAudioUtilities.m */,
+				6628E1331B39D96500020E56 /* EZMicrophone.h */,
+				6628E1341B39D96500020E56 /* EZMicrophone.m */,
+				6628E1351B39D96500020E56 /* EZOutput.h */,
+				6628E1361B39D96500020E56 /* EZOutput.m */,
+				6628E1371B39D96500020E56 /* EZPlot.h */,
+				6628E1381B39D96500020E56 /* EZPlot.m */,
+				6628E1391B39D96500020E56 /* EZRecorder.h */,
+				6628E13A1B39D96500020E56 /* EZRecorder.m */,
+				6628E13B1B39D96500020E56 /* TPCircularBuffer.c */,
+				6628E13C1B39D96500020E56 /* TPCircularBuffer.h */,
+				6628E13D1B39D96500020E56 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		667559101B3B78720013E67E /* VERSION */ = {
+		6628E13D1B39D96500020E56 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				667559111B3B78720013E67E /* CHANGELOG */,
-				667559121B3B78720013E67E /* VERSION */,
+				6628E13E1B39D96500020E56 /* CHANGELOG */,
+				6628E13F1B39D96500020E56 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -225,7 +230,7 @@
 		9417A9711871E88300D9D37B /* EZAudioFFTExample */ = {
 			isa = PBXGroup;
 			children = (
-				667558ED1B3B78720013E67E /* EZAudio */,
+				6628E11C1B39D96500020E56 /* EZAudio */,
 				9417A97A1871E88300D9D37B /* AppDelegate.h */,
 				9417A97B1871E88300D9D37B /* AppDelegate.m */,
 				6628E2321B39F7CC00020E56 /* MainStoryboard.storyboard */,
@@ -343,10 +348,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				9417A9871871E88300D9D37B /* Images.xcassets in Resources */,
-				667559241B3B78720013E67E /* CHANGELOG in Resources */,
 				6628E2331B39F7CC00020E56 /* MainStoryboard.storyboard in Resources */,
+				6628E1511B39D96500020E56 /* VERSION in Resources */,
 				9417A9761871E88300D9D37B /* InfoPlist.strings in Resources */,
-				667559251B3B78720013E67E /* VERSION in Resources */,
+				6628E1501B39D96500020E56 /* CHANGELOG in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -365,24 +370,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6675591B1B3B78720013E67E /* EZAudioPlot.m in Sources */,
-				6675591A1B3B78720013E67E /* EZAudioPlayer.m in Sources */,
+				6628E14E1B39D96500020E56 /* EZRecorder.m in Sources */,
 				9417A97C1871E88300D9D37B /* AppDelegate.m in Sources */,
-				6675591C1B3B78720013E67E /* EZAudioPlotGL.m in Sources */,
-				667559171B3B78720013E67E /* EZAudioFile.m in Sources */,
-				667559201B3B78720013E67E /* EZOutput.m in Sources */,
-				6675591E1B3B78720013E67E /* EZAudioUtilities.m in Sources */,
-				667559211B3B78720013E67E /* EZPlot.m in Sources */,
+				6628E1441B39D96500020E56 /* EZAudioFloatConverter.m in Sources */,
+				6628E1451B39D96500020E56 /* EZAudioFloatData.m in Sources */,
+				6628E1401B39D96500020E56 /* AEFloatConverter.m in Sources */,
+				6628E1431B39D96500020E56 /* EZAudioFile.m in Sources */,
+				6628E14C1B39D96500020E56 /* EZOutput.m in Sources */,
+				6628E1481B39D96500020E56 /* EZAudioPlotGL.m in Sources */,
+				6628E14F1B39D96500020E56 /* TPCircularBuffer.c in Sources */,
+				6628E1471B39D96500020E56 /* EZAudioPlot.m in Sources */,
 				9417A9D01871E97D00D9D37B /* FFTViewController.m in Sources */,
-				667559221B3B78720013E67E /* EZRecorder.m in Sources */,
-				667559191B3B78720013E67E /* EZAudioFloatData.m in Sources */,
-				667559181B3B78720013E67E /* EZAudioFloatConverter.m in Sources */,
-				667559161B3B78720013E67E /* EZAudioDisplayLink.m in Sources */,
-				6675591F1B3B78720013E67E /* EZMicrophone.m in Sources */,
-				667559151B3B78720013E67E /* EZAudioDevice.m in Sources */,
+				6628E14B1B39D96500020E56 /* EZMicrophone.m in Sources */,
+				6628E1461B39D96500020E56 /* EZAudioPlayer.m in Sources */,
+				6628E1421B39D96500020E56 /* EZAudioDevice.m in Sources */,
 				9417A9781871E88300D9D37B /* main.m in Sources */,
-				667559231B3B78720013E67E /* TPCircularBuffer.c in Sources */,
-				667559141B3B78720013E67E /* EZAudio.m in Sources */,
+				6628E14D1B39D96500020E56 /* EZPlot.m in Sources */,
+				6628E1411B39D96500020E56 /* EZAudio.m in Sources */,
+				6628E14A1B39D96500020E56 /* EZAudioUtilities.m in Sources */,
+				6628E1491B39D96500020E56 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -506,7 +512,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EZAudioFFTExample/EZAudioFFTExample-Prefix.pch";
 				INFOPLIST_FILE = "EZAudioFFTExample/EZAudioFFTExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -520,7 +525,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EZAudioFFTExample/EZAudioFFTExample-Prefix.pch";
 				INFOPLIST_FILE = "EZAudioFFTExample/EZAudioFFTExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/AppDelegate.h

@@ -3,7 +3,7 @@
 //  EZAudioFFTExample
 //
 //  Created by Syed Haris Ali on 12/30/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/AppDelegate.m

@@ -3,7 +3,7 @@
 //  EZAudioFFTExample
 //
 //  Created by Syed Haris Ali on 12/30/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/FFTViewController.h

@@ -3,7 +3,7 @@
 //  EZAudioFFTExample
 //
 //  Created by Syed Haris Ali on 12/30/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -40,14 +40,11 @@
  */
 @interface FFTViewController : UIViewController <EZMicrophoneDelegate>
 
-//------------------------------------------------------------------------------
 #pragma mark - Components
-//------------------------------------------------------------------------------
-
 /**
  EZAudioPlot for frequency plot
  */
-@property (nonatomic,weak) IBOutlet EZAudioPlot *audioPlotFreq;
+@property (nonatomic,weak) IBOutlet EZAudioPlotGL *audioPlotFreq;
 
 /**
  EZAudioPlot for time plot

EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/FFTViewController.m

@@ -3,7 +3,7 @@
 //  EZAudioFFTExample
 //
 //  Created by Syed Haris Ali on 12/30/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -47,47 +47,29 @@
 #pragma mark - Customize the Audio Plot
 - (void)viewDidLoad
 {
-    [super viewDidLoad];
-
-    //
-    // Setup the AVAudioSession. EZMicrophone will not work properly on iOS
-    // if you don't do this!
-    //
-    AVAudioSession *session = [AVAudioSession sharedInstance];
-    NSError *error;
-    [session setCategory:AVAudioSessionCategoryPlayAndRecord error:&error];
-    if (error)
-    {
-        NSLog(@"Error setting up audio session category: %@", error.localizedDescription);
-    }
-    [session setActive:YES error:&error];
-    if (error)
-    {
-        NSLog(@"Error setting up audio session active: %@", error.localizedDescription);
-    }
-    
-    /*
-    Customizing the audio plot's look
-    */
-    // Setup time domain audio plot
-    self.audioPlotTime.backgroundColor = [UIColor colorWithRed: 0.569 green: 0.82 blue: 0.478 alpha: 1];
-    self.audioPlotTime.color           = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:1.0];
-    self.audioPlotTime.shouldFill      = YES;
-    self.audioPlotTime.shouldMirror    = YES;
-    self.audioPlotTime.plotType        = EZPlotTypeRolling;
-
-    // Setup frequency domain audio plot
-    self.audioPlotFreq.backgroundColor = [UIColor colorWithRed: 0.984 green: 0.471 blue: 0.525 alpha: 1];
-    self.audioPlotFreq.color           = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:1.0];
-    self.audioPlotFreq.shouldFill      = YES;
-    self.audioPlotFreq.plotType        = EZPlotTypeBuffer;
-    self.audioPlotFreq.shouldCenterYAxis = NO;
+  [super viewDidLoad];
   
-    /*
-    Start the microphone
-    */
-    self.microphone = [EZMicrophone microphoneWithDelegate:self
-                                         startsImmediately:YES];
+  /*
+   Customizing the audio plot's look
+   */
+  // Setup time domain audio plot
+  self.audioPlotTime.backgroundColor = [UIColor colorWithRed: 0.569 green: 0.82 blue: 0.478 alpha: 1];
+  self.audioPlotTime.color           = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:1.0];
+  self.audioPlotTime.shouldFill      = YES;
+  self.audioPlotTime.shouldMirror    = YES;
+  self.audioPlotTime.plotType        = EZPlotTypeRolling;
+  
+  // Setup frequency domain audio plot
+  self.audioPlotFreq.backgroundColor = [UIColor colorWithRed: 0.984 green: 0.471 blue: 0.525 alpha: 1];
+  self.audioPlotFreq.color           = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:1.0];
+  self.audioPlotFreq.shouldFill      = YES;
+  self.audioPlotFreq.plotType        = EZPlotTypeBuffer;
+  
+  /*
+   Start the microphone
+   */
+  self.microphone = [EZMicrophone microphoneWithDelegate:self
+                                       startsImmediately:YES];
   
 }
 

EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/MainStoryboard.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Weo-wK-GIV">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Weo-wK-GIV">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -17,7 +17,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rTC-r5-1nY" customClass="EZAudioPlot">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rTC-r5-1nY" customClass="EZAudioPlotGL">
                                 <rect key="frame" x="0.0" y="300" width="600" height="300"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                             </view>

EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExample/main.m

@@ -3,7 +3,7 @@
 //  EZAudioFFTExample
 //
 //  Created by Syed Haris Ali on 12/30/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

EZAudioExamples/iOS/EZAudioFFTExample/EZAudioFFTExampleTests/EZAudioFFTExampleTests.m

@@ -3,7 +3,7 @@
 //  EZAudioFFTExampleTests
 //
 //  Created by Syed Haris Ali on 12/30/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <XCTest/XCTest.h>

EZAudioExamples/iOS/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample.xcodeproj/project.pbxproj

@@ -7,23 +7,24 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		667559F81B3B78940013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559D51B3B78940013E67E /* EZAudio.m */; };
-		667559F91B3B78940013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559D71B3B78940013E67E /* EZAudioDevice.m */; };
-		667559FA1B3B78940013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559D91B3B78940013E67E /* EZAudioDisplayLink.m */; };
-		667559FB1B3B78940013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559DB1B3B78940013E67E /* EZAudioFile.m */; };
-		667559FC1B3B78940013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559DD1B3B78940013E67E /* EZAudioFloatConverter.m */; };
-		667559FD1B3B78940013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559DF1B3B78940013E67E /* EZAudioFloatData.m */; };
-		667559FE1B3B78940013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559E11B3B78940013E67E /* EZAudioPlayer.m */; };
-		667559FF1B3B78940013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559E31B3B78940013E67E /* EZAudioPlot.m */; };
-		66755A001B3B78940013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559E51B3B78940013E67E /* EZAudioPlotGL.m */; };
-		66755A021B3B78940013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559E91B3B78940013E67E /* EZAudioUtilities.m */; };
-		66755A031B3B78940013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559EB1B3B78940013E67E /* EZMicrophone.m */; };
-		66755A041B3B78940013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559ED1B3B78940013E67E /* EZOutput.m */; };
-		66755A051B3B78940013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559EF1B3B78940013E67E /* EZPlot.m */; };
-		66755A061B3B78940013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559F11B3B78940013E67E /* EZRecorder.m */; };
-		66755A071B3B78940013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 667559F21B3B78940013E67E /* TPCircularBuffer.c */; };
-		66755A081B3B78940013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 667559F51B3B78940013E67E /* CHANGELOG */; };
-		66755A091B3B78940013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 667559F61B3B78940013E67E /* VERSION */; };
+		6628E10A1B39D8D000020E56 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0E81B39D8D000020E56 /* AEFloatConverter.m */; };
+		6628E10B1B39D8D000020E56 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0EA1B39D8D000020E56 /* EZAudio.m */; };
+		6628E10C1B39D8D000020E56 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0EC1B39D8D000020E56 /* EZAudioDevice.m */; };
+		6628E10D1B39D8D000020E56 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0EE1B39D8D000020E56 /* EZAudioFile.m */; };
+		6628E10E1B39D8D000020E56 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0F01B39D8D000020E56 /* EZAudioFloatConverter.m */; };
+		6628E10F1B39D8D000020E56 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0F21B39D8D000020E56 /* EZAudioFloatData.m */; };
+		6628E1101B39D8D000020E56 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0F41B39D8D000020E56 /* EZAudioPlayer.m */; };
+		6628E1111B39D8D000020E56 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0F61B39D8D000020E56 /* EZAudioPlot.m */; };
+		6628E1121B39D8D000020E56 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0F81B39D8D000020E56 /* EZAudioPlotGL.m */; };
+		6628E1131B39D8D000020E56 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0FA1B39D8D000020E56 /* EZAudioPlotGLKViewController.m */; };
+		6628E1141B39D8D000020E56 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0FC1B39D8D000020E56 /* EZAudioUtilities.m */; };
+		6628E1151B39D8D000020E56 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E0FE1B39D8D000020E56 /* EZMicrophone.m */; };
+		6628E1161B39D8D000020E56 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1001B39D8D000020E56 /* EZOutput.m */; };
+		6628E1171B39D8D000020E56 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1021B39D8D000020E56 /* EZPlot.m */; };
+		6628E1181B39D8D000020E56 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1041B39D8D000020E56 /* EZRecorder.m */; };
+		6628E1191B39D8D000020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1051B39D8D000020E56 /* TPCircularBuffer.c */; };
+		6628E11A1B39D8D000020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1081B39D8D000020E56 /* CHANGELOG */; };
+		6628E11B1B39D8D000020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1091B39D8D000020E56 /* VERSION */; };
 		66DB85B81B05714F0018EFC5 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 66DB85B71B05714F0018EFC5 /* MainStoryboard.storyboard */; };
 		94056FEC185E5EAF00EB94BA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94056FEB185E5EAF00EB94BA /* Foundation.framework */; };
 		94056FEE185E5EAF00EB94BA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94056FED185E5EAF00EB94BA /* CoreGraphics.framework */; };
@@ -54,38 +55,40 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		667559D41B3B78940013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		667559D51B3B78940013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		667559D61B3B78940013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		667559D71B3B78940013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		667559D81B3B78940013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		667559D91B3B78940013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		667559DA1B3B78940013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		667559DB1B3B78940013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		667559DC1B3B78940013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		667559DD1B3B78940013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		667559DE1B3B78940013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		667559DF1B3B78940013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		667559E01B3B78940013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		667559E11B3B78940013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		667559E21B3B78940013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		667559E31B3B78940013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		667559E41B3B78940013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		667559E51B3B78940013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		667559E81B3B78940013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		667559E91B3B78940013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		667559EA1B3B78940013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		667559EB1B3B78940013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		667559EC1B3B78940013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		667559ED1B3B78940013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		667559EE1B3B78940013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		667559EF1B3B78940013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		667559F01B3B78940013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		667559F11B3B78940013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		667559F21B3B78940013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		667559F31B3B78940013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		667559F51B3B78940013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		667559F61B3B78940013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
+		6628E0E71B39D8D000020E56 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		6628E0E81B39D8D000020E56 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		6628E0E91B39D8D000020E56 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		6628E0EA1B39D8D000020E56 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		6628E0EB1B39D8D000020E56 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		6628E0EC1B39D8D000020E56 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		6628E0ED1B39D8D000020E56 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		6628E0EE1B39D8D000020E56 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		6628E0EF1B39D8D000020E56 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		6628E0F01B39D8D000020E56 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		6628E0F11B39D8D000020E56 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		6628E0F21B39D8D000020E56 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		6628E0F31B39D8D000020E56 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		6628E0F41B39D8D000020E56 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		6628E0F51B39D8D000020E56 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		6628E0F61B39D8D000020E56 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		6628E0F71B39D8D000020E56 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		6628E0F81B39D8D000020E56 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		6628E0F91B39D8D000020E56 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		6628E0FA1B39D8D000020E56 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		6628E0FB1B39D8D000020E56 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		6628E0FC1B39D8D000020E56 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		6628E0FD1B39D8D000020E56 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		6628E0FE1B39D8D000020E56 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		6628E0FF1B39D8D000020E56 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		6628E1001B39D8D000020E56 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		6628E1011B39D8D000020E56 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		6628E1021B39D8D000020E56 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		6628E1031B39D8D000020E56 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		6628E1041B39D8D000020E56 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		6628E1051B39D8D000020E56 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		6628E1061B39D8D000020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		6628E1081B39D8D000020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		6628E1091B39D8D000020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		66DB85B71B05714F0018EFC5 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
 		94056FE8185E5EAF00EB94BA /* EZAudioOpenGLWaveformExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioOpenGLWaveformExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		94056FEB185E5EAF00EB94BA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -137,50 +140,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		667559D11B3B78940013E67E /* EZAudio */ = {
+		6628E0E61B39D8D000020E56 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				667559D41B3B78940013E67E /* EZAudio.h */,
-				667559D51B3B78940013E67E /* EZAudio.m */,
-				667559D61B3B78940013E67E /* EZAudioDevice.h */,
-				667559D71B3B78940013E67E /* EZAudioDevice.m */,
-				667559D81B3B78940013E67E /* EZAudioDisplayLink.h */,
-				667559D91B3B78940013E67E /* EZAudioDisplayLink.m */,
-				667559DA1B3B78940013E67E /* EZAudioFile.h */,
-				667559DB1B3B78940013E67E /* EZAudioFile.m */,
-				667559DC1B3B78940013E67E /* EZAudioFloatConverter.h */,
-				667559DD1B3B78940013E67E /* EZAudioFloatConverter.m */,
-				667559DE1B3B78940013E67E /* EZAudioFloatData.h */,
-				667559DF1B3B78940013E67E /* EZAudioFloatData.m */,
-				667559E01B3B78940013E67E /* EZAudioPlayer.h */,
-				667559E11B3B78940013E67E /* EZAudioPlayer.m */,
-				667559E21B3B78940013E67E /* EZAudioPlot.h */,
-				667559E31B3B78940013E67E /* EZAudioPlot.m */,
-				667559E41B3B78940013E67E /* EZAudioPlotGL.h */,
-				667559E51B3B78940013E67E /* EZAudioPlotGL.m */,
-				667559E81B3B78940013E67E /* EZAudioUtilities.h */,
-				667559E91B3B78940013E67E /* EZAudioUtilities.m */,
-				667559EA1B3B78940013E67E /* EZMicrophone.h */,
-				667559EB1B3B78940013E67E /* EZMicrophone.m */,
-				667559EC1B3B78940013E67E /* EZOutput.h */,
-				667559ED1B3B78940013E67E /* EZOutput.m */,
-				667559EE1B3B78940013E67E /* EZPlot.h */,
-				667559EF1B3B78940013E67E /* EZPlot.m */,
-				667559F01B3B78940013E67E /* EZRecorder.h */,
-				667559F11B3B78940013E67E /* EZRecorder.m */,
-				667559F21B3B78940013E67E /* TPCircularBuffer.c */,
-				667559F31B3B78940013E67E /* TPCircularBuffer.h */,
-				667559F41B3B78940013E67E /* VERSION */,
+				6628E0E71B39D8D000020E56 /* AEFloatConverter.h */,
+				6628E0E81B39D8D000020E56 /* AEFloatConverter.m */,
+				6628E0E91B39D8D000020E56 /* EZAudio.h */,
+				6628E0EA1B39D8D000020E56 /* EZAudio.m */,
+				6628E0EB1B39D8D000020E56 /* EZAudioDevice.h */,
+				6628E0EC1B39D8D000020E56 /* EZAudioDevice.m */,
+				6628E0ED1B39D8D000020E56 /* EZAudioFile.h */,
+				6628E0EE1B39D8D000020E56 /* EZAudioFile.m */,
+				6628E0EF1B39D8D000020E56 /* EZAudioFloatConverter.h */,
+				6628E0F01B39D8D000020E56 /* EZAudioFloatConverter.m */,
+				6628E0F11B39D8D000020E56 /* EZAudioFloatData.h */,
+				6628E0F21B39D8D000020E56 /* EZAudioFloatData.m */,
+				6628E0F31B39D8D000020E56 /* EZAudioPlayer.h */,
+				6628E0F41B39D8D000020E56 /* EZAudioPlayer.m */,
+				6628E0F51B39D8D000020E56 /* EZAudioPlot.h */,
+				6628E0F61B39D8D000020E56 /* EZAudioPlot.m */,
+				6628E0F71B39D8D000020E56 /* EZAudioPlotGL.h */,
+				6628E0F81B39D8D000020E56 /* EZAudioPlotGL.m */,
+				6628E0F91B39D8D000020E56 /* EZAudioPlotGLKViewController.h */,
+				6628E0FA1B39D8D000020E56 /* EZAudioPlotGLKViewController.m */,
+				6628E0FB1B39D8D000020E56 /* EZAudioUtilities.h */,
+				6628E0FC1B39D8D000020E56 /* EZAudioUtilities.m */,
+				6628E0FD1B39D8D000020E56 /* EZMicrophone.h */,
+				6628E0FE1B39D8D000020E56 /* EZMicrophone.m */,
+				6628E0FF1B39D8D000020E56 /* EZOutput.h */,
+				6628E1001B39D8D000020E56 /* EZOutput.m */,
+				6628E1011B39D8D000020E56 /* EZPlot.h */,
+				6628E1021B39D8D000020E56 /* EZPlot.m */,
+				6628E1031B39D8D000020E56 /* EZRecorder.h */,
+				6628E1041B39D8D000020E56 /* EZRecorder.m */,
+				6628E1051B39D8D000020E56 /* TPCircularBuffer.c */,
+				6628E1061B39D8D000020E56 /* TPCircularBuffer.h */,
+				6628E1071B39D8D000020E56 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		667559F41B3B78940013E67E /* VERSION */ = {
+		6628E1071B39D8D000020E56 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				667559F51B3B78940013E67E /* CHANGELOG */,
-				667559F61B3B78940013E67E /* VERSION */,
+				6628E1081B39D8D000020E56 /* CHANGELOG */,
+				6628E1091B39D8D000020E56 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -221,7 +226,7 @@
 		94056FF1185E5EAF00EB94BA /* EZAudioOpenGLWaveformExample */ = {
 			isa = PBXGroup;
 			children = (
-				667559D11B3B78940013E67E /* EZAudio */,
+				6628E0E61B39D8D000020E56 /* EZAudio */,
 				94056FFA185E5EAF00EB94BA /* AppDelegate.h */,
 				94056FFB185E5EAF00EB94BA /* AppDelegate.m */,
 				66DB85B71B05714F0018EFC5 /* MainStoryboard.storyboard */,
@@ -339,10 +344,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				94057007185E5EAF00EB94BA /* Images.xcassets in Resources */,
-				66755A081B3B78940013E67E /* CHANGELOG in Resources */,
+				6628E11A1B39D8D000020E56 /* CHANGELOG in Resources */,
 				66DB85B81B05714F0018EFC5 /* MainStoryboard.storyboard in Resources */,
 				94056FF6185E5EAF00EB94BA /* InfoPlist.strings in Resources */,
-				66755A091B3B78940013E67E /* VERSION in Resources */,
+				6628E11B1B39D8D000020E56 /* VERSION in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -361,24 +366,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				667559FF1B3B78940013E67E /* EZAudioPlot.m in Sources */,
-				667559FE1B3B78940013E67E /* EZAudioPlayer.m in Sources */,
+				6628E1181B39D8D000020E56 /* EZRecorder.m in Sources */,
 				94057050185E636100EB94BA /* OpenGLWaveformViewController.m in Sources */,
-				66755A001B3B78940013E67E /* EZAudioPlotGL.m in Sources */,
-				667559FB1B3B78940013E67E /* EZAudioFile.m in Sources */,
-				66755A041B3B78940013E67E /* EZOutput.m in Sources */,
-				66755A021B3B78940013E67E /* EZAudioUtilities.m in Sources */,
-				66755A051B3B78940013E67E /* EZPlot.m in Sources */,
+				6628E10E1B39D8D000020E56 /* EZAudioFloatConverter.m in Sources */,
+				6628E10F1B39D8D000020E56 /* EZAudioFloatData.m in Sources */,
+				6628E10A1B39D8D000020E56 /* AEFloatConverter.m in Sources */,
+				6628E10D1B39D8D000020E56 /* EZAudioFile.m in Sources */,
+				6628E1161B39D8D000020E56 /* EZOutput.m in Sources */,
+				6628E1121B39D8D000020E56 /* EZAudioPlotGL.m in Sources */,
+				6628E1191B39D8D000020E56 /* TPCircularBuffer.c in Sources */,
+				6628E1111B39D8D000020E56 /* EZAudioPlot.m in Sources */,
 				94056FFC185E5EAF00EB94BA /* AppDelegate.m in Sources */,
-				66755A061B3B78940013E67E /* EZRecorder.m in Sources */,
-				667559FD1B3B78940013E67E /* EZAudioFloatData.m in Sources */,
-				667559FC1B3B78940013E67E /* EZAudioFloatConverter.m in Sources */,
-				667559FA1B3B78940013E67E /* EZAudioDisplayLink.m in Sources */,
-				66755A031B3B78940013E67E /* EZMicrophone.m in Sources */,
-				667559F91B3B78940013E67E /* EZAudioDevice.m in Sources */,
+				6628E1151B39D8D000020E56 /* EZMicrophone.m in Sources */,
+				6628E1101B39D8D000020E56 /* EZAudioPlayer.m in Sources */,
+				6628E10C1B39D8D000020E56 /* EZAudioDevice.m in Sources */,
 				94056FF8185E5EAF00EB94BA /* main.m in Sources */,
-				66755A071B3B78940013E67E /* TPCircularBuffer.c in Sources */,
-				667559F81B3B78940013E67E /* EZAudio.m in Sources */,
+				6628E1171B39D8D000020E56 /* EZPlot.m in Sources */,
+				6628E10B1B39D8D000020E56 /* EZAudio.m in Sources */,
+				6628E1141B39D8D000020E56 /* EZAudioUtilities.m in Sources */,
+				6628E1131B39D8D000020E56 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -502,7 +508,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample-Prefix.pch";
 				INFOPLIST_FILE = "EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -516,7 +521,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample-Prefix.pch";
 				INFOPLIST_FILE = "EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

EZAudioExamples/iOS/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/AppDelegate.h

@@ -3,7 +3,7 @@
 //  EZAudioOpenGLWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

EZAudioExamples/iOS/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/AppDelegate.m

@@ -3,7 +3,7 @@
 //  EZAudioOpenGLWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import "AppDelegate.h"

EZAudioExamples/iOS/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/MainStoryboard.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="1v1-63-VYU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="1v1-63-VYU">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>

EZAudioExamples/iOS/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/OpenGLWaveformViewController.h

@@ -3,7 +3,7 @@
 //  EZAudioOpenGLWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

EZAudioExamples/iOS/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/OpenGLWaveformViewController.m

@@ -3,7 +3,7 @@
 //  EZAudioOpenGLWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import "OpenGLWaveformViewController.h"
@@ -24,7 +24,7 @@
 }
 
 //------------------------------------------------------------------------------
-#pragma mark - Setup
+#pragma mark - Customize the Audio Plot
 //------------------------------------------------------------------------------
 
 - (void)viewDidLoad

EZAudioExamples/iOS/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExample/main.m

@@ -3,7 +3,7 @@
 //  EZAudioOpenGLWaveformExample
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

EZAudioExamples/iOS/EZAudioOpenGLWaveformExample/EZAudioOpenGLWaveformExampleTests/EZAudioOpenGLWaveformExampleTests.m

@@ -3,7 +3,7 @@
 //  EZAudioOpenGLWaveformExampleTests
 //
 //  Created by Syed Haris Ali on 12/15/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <XCTest/XCTest.h>

EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample.xcodeproj/project.pbxproj

@@ -7,24 +7,25 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6628E1761B39D96F00020E56 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1541B39D96F00020E56 /* AEFloatConverter.m */; };
+		6628E1771B39D96F00020E56 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1561B39D96F00020E56 /* EZAudio.m */; };
+		6628E1781B39D96F00020E56 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1581B39D96F00020E56 /* EZAudioDevice.m */; };
+		6628E1791B39D96F00020E56 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E15A1B39D96F00020E56 /* EZAudioFile.m */; };
+		6628E17A1B39D96F00020E56 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E15C1B39D96F00020E56 /* EZAudioFloatConverter.m */; };
+		6628E17B1B39D96F00020E56 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E15E1B39D96F00020E56 /* EZAudioFloatData.m */; };
+		6628E17C1B39D96F00020E56 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1601B39D96F00020E56 /* EZAudioPlayer.m */; };
+		6628E17D1B39D96F00020E56 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1621B39D96F00020E56 /* EZAudioPlot.m */; };
+		6628E17E1B39D96F00020E56 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1641B39D96F00020E56 /* EZAudioPlotGL.m */; };
+		6628E17F1B39D96F00020E56 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1661B39D96F00020E56 /* EZAudioPlotGLKViewController.m */; };
+		6628E1801B39D96F00020E56 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1681B39D96F00020E56 /* EZAudioUtilities.m */; };
+		6628E1811B39D96F00020E56 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E16A1B39D96F00020E56 /* EZMicrophone.m */; };
+		6628E1821B39D96F00020E56 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E16C1B39D96F00020E56 /* EZOutput.m */; };
+		6628E1831B39D96F00020E56 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E16E1B39D96F00020E56 /* EZPlot.m */; };
+		6628E1841B39D96F00020E56 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1701B39D96F00020E56 /* EZRecorder.m */; };
+		6628E1851B39D96F00020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1711B39D96F00020E56 /* TPCircularBuffer.c */; };
+		6628E1861B39D96F00020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1741B39D96F00020E56 /* CHANGELOG */; };
+		6628E1871B39D96F00020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E1751B39D96F00020E56 /* VERSION */; };
 		6628E2311B39F7C300020E56 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2301B39F7C300020E56 /* MainStoryboard.storyboard */; };
-		6675594D1B3B78790013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675592A1B3B78790013E67E /* EZAudio.m */; };
-		6675594E1B3B78790013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675592C1B3B78790013E67E /* EZAudioDevice.m */; };
-		6675594F1B3B78790013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675592E1B3B78790013E67E /* EZAudioDisplayLink.m */; };
-		667559501B3B78790013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559301B3B78790013E67E /* EZAudioFile.m */; };
-		667559511B3B78790013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559321B3B78790013E67E /* EZAudioFloatConverter.m */; };
-		667559521B3B78790013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559341B3B78790013E67E /* EZAudioFloatData.m */; };
-		667559531B3B78790013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559361B3B78790013E67E /* EZAudioPlayer.m */; };
-		667559541B3B78790013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559381B3B78790013E67E /* EZAudioPlot.m */; };
-		667559551B3B78790013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675593A1B3B78790013E67E /* EZAudioPlotGL.m */; };
-		667559571B3B78790013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6675593E1B3B78790013E67E /* EZAudioUtilities.m */; };
-		667559581B3B78790013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559401B3B78790013E67E /* EZMicrophone.m */; };
-		667559591B3B78790013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559421B3B78790013E67E /* EZOutput.m */; };
-		6675595A1B3B78790013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559441B3B78790013E67E /* EZPlot.m */; };
-		6675595B1B3B78790013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 667559461B3B78790013E67E /* EZRecorder.m */; };
-		6675595C1B3B78790013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 667559471B3B78790013E67E /* TPCircularBuffer.c */; };
-		6675595D1B3B78790013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6675594A1B3B78790013E67E /* CHANGELOG */; };
-		6675595E1B3B78790013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6675594B1B3B78790013E67E /* VERSION */; };
 		9417A60E1864D4DC00D9D37B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A60D1864D4DC00D9D37B /* Foundation.framework */; };
 		9417A6101864D4DC00D9D37B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A60F1864D4DC00D9D37B /* CoreGraphics.framework */; };
 		9417A6121864D4DC00D9D37B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A6111864D4DC00D9D37B /* UIKit.framework */; };
@@ -54,39 +55,41 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		6628E1531B39D96F00020E56 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		6628E1541B39D96F00020E56 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		6628E1551B39D96F00020E56 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		6628E1561B39D96F00020E56 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		6628E1571B39D96F00020E56 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		6628E1581B39D96F00020E56 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		6628E1591B39D96F00020E56 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		6628E15A1B39D96F00020E56 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		6628E15B1B39D96F00020E56 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		6628E15C1B39D96F00020E56 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		6628E15D1B39D96F00020E56 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		6628E15E1B39D96F00020E56 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		6628E15F1B39D96F00020E56 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		6628E1601B39D96F00020E56 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		6628E1611B39D96F00020E56 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		6628E1621B39D96F00020E56 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		6628E1631B39D96F00020E56 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		6628E1641B39D96F00020E56 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		6628E1651B39D96F00020E56 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		6628E1661B39D96F00020E56 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		6628E1671B39D96F00020E56 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		6628E1681B39D96F00020E56 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		6628E1691B39D96F00020E56 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		6628E16A1B39D96F00020E56 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		6628E16B1B39D96F00020E56 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		6628E16C1B39D96F00020E56 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		6628E16D1B39D96F00020E56 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		6628E16E1B39D96F00020E56 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		6628E16F1B39D96F00020E56 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		6628E1701B39D96F00020E56 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		6628E1711B39D96F00020E56 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		6628E1721B39D96F00020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		6628E1741B39D96F00020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		6628E1751B39D96F00020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		6628E2301B39F7C300020E56 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
-		667559291B3B78790013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		6675592A1B3B78790013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		6675592B1B3B78790013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		6675592C1B3B78790013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		6675592D1B3B78790013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		6675592E1B3B78790013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		6675592F1B3B78790013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		667559301B3B78790013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		667559311B3B78790013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		667559321B3B78790013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		667559331B3B78790013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		667559341B3B78790013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		667559351B3B78790013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		667559361B3B78790013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		667559371B3B78790013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		667559381B3B78790013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		667559391B3B78790013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		6675593A1B3B78790013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		6675593D1B3B78790013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		6675593E1B3B78790013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		6675593F1B3B78790013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		667559401B3B78790013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		667559411B3B78790013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		667559421B3B78790013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		667559431B3B78790013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		667559441B3B78790013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		667559451B3B78790013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		667559461B3B78790013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		667559471B3B78790013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		667559481B3B78790013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		6675594A1B3B78790013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		6675594B1B3B78790013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		9417A60A1864D4DC00D9D37B /* EZAudioPassThroughExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EZAudioPassThroughExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9417A60D1864D4DC00D9D37B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		9417A60F1864D4DC00D9D37B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -137,50 +140,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		667559261B3B78790013E67E /* EZAudio */ = {
+		6628E1521B39D96F00020E56 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				667559291B3B78790013E67E /* EZAudio.h */,
-				6675592A1B3B78790013E67E /* EZAudio.m */,
-				6675592B1B3B78790013E67E /* EZAudioDevice.h */,
-				6675592C1B3B78790013E67E /* EZAudioDevice.m */,
-				6675592D1B3B78790013E67E /* EZAudioDisplayLink.h */,
-				6675592E1B3B78790013E67E /* EZAudioDisplayLink.m */,
-				6675592F1B3B78790013E67E /* EZAudioFile.h */,
-				667559301B3B78790013E67E /* EZAudioFile.m */,
-				667559311B3B78790013E67E /* EZAudioFloatConverter.h */,
-				667559321B3B78790013E67E /* EZAudioFloatConverter.m */,
-				667559331B3B78790013E67E /* EZAudioFloatData.h */,
-				667559341B3B78790013E67E /* EZAudioFloatData.m */,
-				667559351B3B78790013E67E /* EZAudioPlayer.h */,
-				667559361B3B78790013E67E /* EZAudioPlayer.m */,
-				667559371B3B78790013E67E /* EZAudioPlot.h */,
-				667559381B3B78790013E67E /* EZAudioPlot.m */,
-				667559391B3B78790013E67E /* EZAudioPlotGL.h */,
-				6675593A1B3B78790013E67E /* EZAudioPlotGL.m */,
-				6675593D1B3B78790013E67E /* EZAudioUtilities.h */,
-				6675593E1B3B78790013E67E /* EZAudioUtilities.m */,
-				6675593F1B3B78790013E67E /* EZMicrophone.h */,
-				667559401B3B78790013E67E /* EZMicrophone.m */,
-				667559411B3B78790013E67E /* EZOutput.h */,
-				667559421B3B78790013E67E /* EZOutput.m */,
-				667559431B3B78790013E67E /* EZPlot.h */,
-				667559441B3B78790013E67E /* EZPlot.m */,
-				667559451B3B78790013E67E /* EZRecorder.h */,
-				667559461B3B78790013E67E /* EZRecorder.m */,
-				667559471B3B78790013E67E /* TPCircularBuffer.c */,
-				667559481B3B78790013E67E /* TPCircularBuffer.h */,
-				667559491B3B78790013E67E /* VERSION */,
+				6628E1531B39D96F00020E56 /* AEFloatConverter.h */,
+				6628E1541B39D96F00020E56 /* AEFloatConverter.m */,
+				6628E1551B39D96F00020E56 /* EZAudio.h */,
+				6628E1561B39D96F00020E56 /* EZAudio.m */,
+				6628E1571B39D96F00020E56 /* EZAudioDevice.h */,
+				6628E1581B39D96F00020E56 /* EZAudioDevice.m */,
+				6628E1591B39D96F00020E56 /* EZAudioFile.h */,
+				6628E15A1B39D96F00020E56 /* EZAudioFile.m */,
+				6628E15B1B39D96F00020E56 /* EZAudioFloatConverter.h */,
+				6628E15C1B39D96F00020E56 /* EZAudioFloatConverter.m */,
+				6628E15D1B39D96F00020E56 /* EZAudioFloatData.h */,
+				6628E15E1B39D96F00020E56 /* EZAudioFloatData.m */,
+				6628E15F1B39D96F00020E56 /* EZAudioPlayer.h */,
+				6628E1601B39D96F00020E56 /* EZAudioPlayer.m */,
+				6628E1611B39D96F00020E56 /* EZAudioPlot.h */,
+				6628E1621B39D96F00020E56 /* EZAudioPlot.m */,
+				6628E1631B39D96F00020E56 /* EZAudioPlotGL.h */,
+				6628E1641B39D96F00020E56 /* EZAudioPlotGL.m */,
+				6628E1651B39D96F00020E56 /* EZAudioPlotGLKViewController.h */,
+				6628E1661B39D96F00020E56 /* EZAudioPlotGLKViewController.m */,
+				6628E1671B39D96F00020E56 /* EZAudioUtilities.h */,
+				6628E1681B39D96F00020E56 /* EZAudioUtilities.m */,
+				6628E1691B39D96F00020E56 /* EZMicrophone.h */,
+				6628E16A1B39D96F00020E56 /* EZMicrophone.m */,
+				6628E16B1B39D96F00020E56 /* EZOutput.h */,
+				6628E16C1B39D96F00020E56 /* EZOutput.m */,
+				6628E16D1B39D96F00020E56 /* EZPlot.h */,
+				6628E16E1B39D96F00020E56 /* EZPlot.m */,
+				6628E16F1B39D96F00020E56 /* EZRecorder.h */,
+				6628E1701B39D96F00020E56 /* EZRecorder.m */,
+				6628E1711B39D96F00020E56 /* TPCircularBuffer.c */,
+				6628E1721B39D96F00020E56 /* TPCircularBuffer.h */,
+				6628E1731B39D96F00020E56 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		667559491B3B78790013E67E /* VERSION */ = {
+		6628E1731B39D96F00020E56 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				6675594A1B3B78790013E67E /* CHANGELOG */,
-				6675594B1B3B78790013E67E /* VERSION */,
+				6628E1741B39D96F00020E56 /* CHANGELOG */,
+				6628E1751B39D96F00020E56 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -221,7 +226,7 @@
 		9417A6131864D4DC00D9D37B /* EZAudioPassThroughExample */ = {
 			isa = PBXGroup;
 			children = (
-				667559261B3B78790013E67E /* EZAudio */,
+				6628E1521B39D96F00020E56 /* EZAudio */,
 				9417A61C1864D4DC00D9D37B /* AppDelegate.h */,
 				9417A61D1864D4DC00D9D37B /* AppDelegate.m */,
 				6628E2301B39F7C300020E56 /* MainStoryboard.storyboard */,
@@ -339,10 +344,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				9417A6291864D4DC00D9D37B /* Images.xcassets in Resources */,
-				6675595D1B3B78790013E67E /* CHANGELOG in Resources */,
 				6628E2311B39F7C300020E56 /* MainStoryboard.storyboard in Resources */,
+				6628E1871B39D96F00020E56 /* VERSION in Resources */,
 				9417A6181864D4DC00D9D37B /* InfoPlist.strings in Resources */,
-				6675595E1B3B78790013E67E /* VERSION in Resources */,
+				6628E1861B39D96F00020E56 /* CHANGELOG in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -361,24 +366,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				667559541B3B78790013E67E /* EZAudioPlot.m in Sources */,
-				667559531B3B78790013E67E /* EZAudioPlayer.m in Sources */,
+				6628E1841B39D96F00020E56 /* EZRecorder.m in Sources */,
 				9417A61E1864D4DC00D9D37B /* AppDelegate.m in Sources */,
-				667559551B3B78790013E67E /* EZAudioPlotGL.m in Sources */,
-				667559501B3B78790013E67E /* EZAudioFile.m in Sources */,
-				667559591B3B78790013E67E /* EZOutput.m in Sources */,
-				667559571B3B78790013E67E /* EZAudioUtilities.m in Sources */,
-				6675595A1B3B78790013E67E /* EZPlot.m in Sources */,
+				6628E17A1B39D96F00020E56 /* EZAudioFloatConverter.m in Sources */,
+				6628E17B1B39D96F00020E56 /* EZAudioFloatData.m in Sources */,
+				6628E1761B39D96F00020E56 /* AEFloatConverter.m in Sources */,
+				6628E1791B39D96F00020E56 /* EZAudioFile.m in Sources */,
+				6628E1821B39D96F00020E56 /* EZOutput.m in Sources */,
+				6628E17E1B39D96F00020E56 /* EZAudioPlotGL.m in Sources */,
+				6628E1851B39D96F00020E56 /* TPCircularBuffer.c in Sources */,
+				6628E17D1B39D96F00020E56 /* EZAudioPlot.m in Sources */,
 				9417A61A1864D4DC00D9D37B /* main.m in Sources */,
-				6675595B1B3B78790013E67E /* EZRecorder.m in Sources */,
-				667559521B3B78790013E67E /* EZAudioFloatData.m in Sources */,
-				667559511B3B78790013E67E /* EZAudioFloatConverter.m in Sources */,
-				6675594F1B3B78790013E67E /* EZAudioDisplayLink.m in Sources */,
-				667559581B3B78790013E67E /* EZMicrophone.m in Sources */,
-				6675594E1B3B78790013E67E /* EZAudioDevice.m in Sources */,
+				6628E1811B39D96F00020E56 /* EZMicrophone.m in Sources */,
+				6628E17C1B39D96F00020E56 /* EZAudioPlayer.m in Sources */,
+				6628E1781B39D96F00020E56 /* EZAudioDevice.m in Sources */,
 				9417A6501864D51C00D9D37B /* PassThroughViewController.m in Sources */,
-				6675595C1B3B78790013E67E /* TPCircularBuffer.c in Sources */,
-				6675594D1B3B78790013E67E /* EZAudio.m in Sources */,
+				6628E1831B39D96F00020E56 /* EZPlot.m in Sources */,
+				6628E1771B39D96F00020E56 /* EZAudio.m in Sources */,
+				6628E1801B39D96F00020E56 /* EZAudioUtilities.m in Sources */,
+				6628E17F1B39D96F00020E56 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -502,7 +508,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EZAudioPassThroughExample/EZAudioPassThroughExample-Prefix.pch";
 				INFOPLIST_FILE = "EZAudioPassThroughExample/EZAudioPassThroughExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -516,7 +521,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EZAudioPassThroughExample/EZAudioPassThroughExample-Prefix.pch";
 				INFOPLIST_FILE = "EZAudioPassThroughExample/EZAudioPassThroughExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/AppDelegate.h

@@ -3,7 +3,7 @@
 //  EZAudioPassThroughExample
 //
 //  Created by Syed Haris Ali on 12/20/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/AppDelegate.m

@@ -3,7 +3,7 @@
 //  EZAudioPassThroughExample
 //
 //  Created by Syed Haris Ali on 12/20/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal

EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/MainStoryboard.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="zGs-8g-w7u">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="zGs-8g-w7u">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
     </dependencies>
     <scenes>
         <!--Pass Through View Controller-->

EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/PassThroughViewController.h

@@ -3,7 +3,7 @@
 //  EZAudioPassThroughExample
 //
 //  Created by Syed Haris Ali on 12/20/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -28,40 +28,23 @@
 // Import EZAudio header
 #import "EZAudio.h"
 
-@interface PassThroughViewController : UIViewController <EZMicrophoneDelegate>
+@interface PassThroughViewController : UIViewController <EZMicrophoneDelegate,EZOutputDataSource>
 
-//------------------------------------------------------------------------------
 #pragma mark - Components
-//------------------------------------------------------------------------------
-
 /**
  The OpenGL based audio plot
  */
-@property (nonatomic, weak) IBOutlet EZAudioPlotGL *audioPlot;
+@property (nonatomic,weak) IBOutlet EZAudioPlotGL *audioPlot;
 
-//------------------------------------------------------------------------------
-
-/**
- The UILabel used to display whether the microphone is on or off
- */
-@property (nonatomic, weak) IBOutlet UILabel *microphoneTextLabel;
-
-//------------------------------------------------------------------------------
 #pragma mark - Actions
-//------------------------------------------------------------------------------
-
 /**
  Switches the plot drawing type between a buffer plot (visualizes the current stream of audio data from the update function) or a rolling plot (visualizes the audio data over time, this is the classic waveform look)
  */
-- (IBAction)changePlotType:(id)sender;
-
-//------------------------------------------------------------------------------
+-(IBAction)changePlotType:(id)sender;
 
 /**
  Toggles the microphone on and off. When the microphone is on it will send its delegate (aka this view controller) the audio data in various ways (check out the EZMicrophoneDelegate documentation for more details);
  */
-- (IBAction)toggleMicrophone:(id)sender;
-
-//------------------------------------------------------------------------------
+-(IBAction)toggleMicrophone:(id)sender;
 
 @end

EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/PassThroughViewController.m

@@ -3,7 +3,7 @@
 //  EZAudioPassThroughExample
 //
 //  Created by Syed Haris Ali on 12/20/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -25,25 +25,22 @@
 
 #import "PassThroughViewController.h"
 
-//------------------------------------------------------------------------------
-#pragma mark - PassThroughViewController (Implementation)
-//------------------------------------------------------------------------------
+@interface PassThroughViewController (){
+  TPCircularBuffer _circularBuffer;
+}
+#pragma mark - UI Extras
+@property (nonatomic,weak) IBOutlet UILabel *microphoneTextLabel;
+@end
 
 @implementation PassThroughViewController
 
-//------------------------------------------------------------------------------
 #pragma mark - Status Bar Style
-//------------------------------------------------------------------------------
-
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
     return UIStatusBarStyleLightContent;
 }
 
-//------------------------------------------------------------------------------
 #pragma mark - Customize the Audio Plot
-//------------------------------------------------------------------------------
-
 - (void)viewDidLoad
 {
     [super viewDidLoad];
@@ -100,86 +97,62 @@
   
 }
 
-//------------------------------------------------------------------------------
 #pragma mark - Actions
-//------------------------------------------------------------------------------
-
-- (void)changePlotType:(id)sender
-{
-    NSInteger selectedSegment = [sender selectedSegmentIndex];
-    switch(selectedSegment)
-    {
-        case 0:
-            [self drawBufferPlot];
-            break;
-        case 1:
-            [self drawRollingPlot];
-            break;
-        default:
-            break;
-    }
+-(void)changePlotType:(id)sender {
+  NSInteger selectedSegment = [sender selectedSegmentIndex];
+  switch(selectedSegment){
+    case 0:
+      [self drawBufferPlot];
+      break;
+    case 1:
+      [self drawRollingPlot];
+      break;
+    default:
+      break;
+  }
 }
 
-//------------------------------------------------------------------------------
-
-- (void)toggleMicrophone:(id)sender
-{
-    if( ![(UISwitch*)sender isOn] )
-    {
-        [[EZMicrophone sharedMicrophone] stopFetchingAudio];
-        self.microphoneTextLabel.text = @"Microphone Off";
-    }
-    else
-    {
-        [[EZMicrophone sharedMicrophone] startFetchingAudio];
-        self.microphoneTextLabel.text = @"Microphone On";
-    }
+-(void)toggleMicrophone:(id)sender {
+  if( ![(UISwitch*)sender isOn] ){
+    [[EZMicrophone sharedMicrophone] stopFetchingAudio];
+    self.microphoneTextLabel.text = @"Microphone Off";
+  }
+  else {
+    [[EZMicrophone sharedMicrophone] startFetchingAudio];
+    self.microphoneTextLabel.text = @"Microphone On";
+  }
 }
 
-//------------------------------------------------------------------------------
 #pragma mark - Action Extensions
-//------------------------------------------------------------------------------
-
 /*
  Give the visualization of the current buffer (this is almost exactly the openFrameworks audio input eample)
  */
-- (void)drawBufferPlot
-{
-    // Change the plot type to the buffer plot
-    self.audioPlot.plotType = EZPlotTypeBuffer;
-    // Don't mirror over the x-axis
-    self.audioPlot.shouldMirror = NO;
-    // Don't fill
-    self.audioPlot.shouldFill = NO;
+-(void)drawBufferPlot {
+  // Change the plot type to the buffer plot
+  self.audioPlot.plotType = EZPlotTypeBuffer;
+  // Don't mirror over the x-axis
+  self.audioPlot.shouldMirror = NO;
+  // Don't fill
+  self.audioPlot.shouldFill = NO;
 }
 
-//------------------------------------------------------------------------------
-
 /*
  Give the classic mirrored, rolling waveform look
  */
-- (void)drawRollingPlot
-{
-    self.audioPlot.plotType = EZPlotTypeRolling;
-    self.audioPlot.shouldFill = YES;
-    self.audioPlot.shouldMirror = YES;
+-(void)drawRollingPlot {
+  self.audioPlot.plotType = EZPlotTypeRolling;
+  self.audioPlot.shouldFill = YES;
+  self.audioPlot.shouldMirror = YES;
 }
 
-//------------------------------------------------------------------------------
 #pragma mark - EZMicrophoneDelegate
-//------------------------------------------------------------------------------
-
-- (void)    microphone:(EZMicrophone *)microphone
-     hasAudioReceived:(float **)buffer
-       withBufferSize:(UInt32)bufferSize
- withNumberOfChannels:(UInt32)numberOfChannels
-{
-    __weak typeof (self) weakSelf = self;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [weakSelf.audioPlot updateBuffer:buffer[0] withBufferSize:bufferSize];
-    });
+-(void)microphone:(EZMicrophone *)microphone
+ hasAudioReceived:(float **)buffer
+   withBufferSize:(UInt32)bufferSize
+withNumberOfChannels:(UInt32)numberOfChannels {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self.audioPlot updateBuffer:buffer[0] withBufferSize:bufferSize];
+  });
 }
 
-//------------------------------------------------------------------------------
-
 @end

EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExample/main.m

@@ -3,7 +3,7 @@
 //  EZAudioPassThroughExample
 //
 //  Created by Syed Haris Ali on 12/20/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

EZAudioExamples/iOS/EZAudioPassThroughExample/EZAudioPassThroughExampleTests/EZAudioPassThroughExampleTests.m

@@ -3,7 +3,7 @@
 //  EZAudioPassThroughExampleTests
 //
 //  Created by Syed Haris Ali on 12/20/13.
-//  Copyright (c) 2015 Syed Haris Ali. All rights reserved.
+//  Copyright (c) 2013 Syed Haris Ali. All rights reserved.
 //
 
 #import <XCTest/XCTest.h>

EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample.xcodeproj/project.pbxproj

@@ -7,24 +7,25 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6628E2181B39D98600020E56 /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1F61B39D98600020E56 /* AEFloatConverter.m */; };
+		6628E2191B39D98600020E56 /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1F81B39D98600020E56 /* EZAudio.m */; };
+		6628E21A1B39D98600020E56 /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1FA1B39D98600020E56 /* EZAudioDevice.m */; };
+		6628E21B1B39D98600020E56 /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1FC1B39D98600020E56 /* EZAudioFile.m */; };
+		6628E21C1B39D98600020E56 /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E1FE1B39D98600020E56 /* EZAudioFloatConverter.m */; };
+		6628E21D1B39D98600020E56 /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2001B39D98600020E56 /* EZAudioFloatData.m */; };
+		6628E21E1B39D98600020E56 /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2021B39D98600020E56 /* EZAudioPlayer.m */; };
+		6628E21F1B39D98600020E56 /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2041B39D98600020E56 /* EZAudioPlot.m */; };
+		6628E2201B39D98600020E56 /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2061B39D98600020E56 /* EZAudioPlotGL.m */; };
+		6628E2211B39D98600020E56 /* EZAudioPlotGLKViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2081B39D98600020E56 /* EZAudioPlotGLKViewController.m */; };
+		6628E2221B39D98600020E56 /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E20A1B39D98600020E56 /* EZAudioUtilities.m */; };
+		6628E2231B39D98600020E56 /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E20C1B39D98600020E56 /* EZMicrophone.m */; };
+		6628E2241B39D98600020E56 /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E20E1B39D98600020E56 /* EZOutput.m */; };
+		6628E2251B39D98600020E56 /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2101B39D98600020E56 /* EZPlot.m */; };
+		6628E2261B39D98600020E56 /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2121B39D98600020E56 /* EZRecorder.m */; };
+		6628E2271B39D98600020E56 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 6628E2131B39D98600020E56 /* TPCircularBuffer.c */; };
+		6628E2281B39D98600020E56 /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2161B39D98600020E56 /* CHANGELOG */; };
+		6628E2291B39D98600020E56 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 6628E2171B39D98600020E56 /* VERSION */; };
 		6628E22B1B39F7A800020E56 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6628E22A1B39F7A800020E56 /* MainStoryboard.storyboard */; };
-		667558DB1B3B60B80013E67E /* EZAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558B81B3B60B80013E67E /* EZAudio.m */; };
-		667558DC1B3B60B80013E67E /* EZAudioDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558BA1B3B60B80013E67E /* EZAudioDevice.m */; };
-		667558DD1B3B60B80013E67E /* EZAudioDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558BC1B3B60B80013E67E /* EZAudioDisplayLink.m */; };
-		667558DE1B3B60B80013E67E /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558BE1B3B60B80013E67E /* EZAudioFile.m */; };
-		667558DF1B3B60B80013E67E /* EZAudioFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558C01B3B60B80013E67E /* EZAudioFloatConverter.m */; };
-		667558E01B3B60B80013E67E /* EZAudioFloatData.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558C21B3B60B80013E67E /* EZAudioFloatData.m */; };
-		667558E11B3B60B80013E67E /* EZAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558C41B3B60B80013E67E /* EZAudioPlayer.m */; };
-		667558E21B3B60B80013E67E /* EZAudioPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558C61B3B60B80013E67E /* EZAudioPlot.m */; };
-		667558E31B3B60B80013E67E /* EZAudioPlotGL.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558C81B3B60B80013E67E /* EZAudioPlotGL.m */; };
-		667558E51B3B60B80013E67E /* EZAudioUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558CC1B3B60B80013E67E /* EZAudioUtilities.m */; };
-		667558E61B3B60B80013E67E /* EZMicrophone.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558CE1B3B60B80013E67E /* EZMicrophone.m */; };
-		667558E71B3B60B80013E67E /* EZOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558D01B3B60B80013E67E /* EZOutput.m */; };
-		667558E81B3B60B80013E67E /* EZPlot.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558D21B3B60B80013E67E /* EZPlot.m */; };
-		667558E91B3B60B80013E67E /* EZRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 667558D41B3B60B80013E67E /* EZRecorder.m */; };
-		667558EA1B3B60B80013E67E /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 667558D51B3B60B80013E67E /* TPCircularBuffer.c */; };
-		667558EB1B3B60B80013E67E /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 667558D81B3B60B80013E67E /* CHANGELOG */; };
-		667558EC1B3B60B80013E67E /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 667558D91B3B60B80013E67E /* VERSION */; };
 		9417A6C718658FB500D9D37B /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A6C618658FB500D9D37B /* AudioToolbox.framework */; };
 		9417A6C918658FC000D9D37B /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9417A6C818658FC000D9D37B /* GLKit.framework */; };
 		9417A6D1186591CA00D9D37B /* simple-drum-beat.wav in Resources */ = {isa = PBXBuildFile; fileRef = 9417A6D0186591CA00D9D37B /* simple-drum-beat.wav */; };
@@ -55,39 +56,41 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		6628E1F51B39D98600020E56 /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
+		6628E1F61B39D98600020E56 /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
+		6628E1F71B39D98600020E56 /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
+		6628E1F81B39D98600020E56 /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
+		6628E1F91B39D98600020E56 /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
+		6628E1FA1B39D98600020E56 /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
+		6628E1FB1B39D98600020E56 /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
+		6628E1FC1B39D98600020E56 /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
+		6628E1FD1B39D98600020E56 /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
+		6628E1FE1B39D98600020E56 /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
+		6628E1FF1B39D98600020E56 /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
+		6628E2001B39D98600020E56 /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
+		6628E2011B39D98600020E56 /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
+		6628E2021B39D98600020E56 /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
+		6628E2031B39D98600020E56 /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
+		6628E2041B39D98600020E56 /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
+		6628E2051B39D98600020E56 /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
+		6628E2061B39D98600020E56 /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
+		6628E2071B39D98600020E56 /* EZAudioPlotGLKViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGLKViewController.h; sourceTree = "<group>"; };
+		6628E2081B39D98600020E56 /* EZAudioPlotGLKViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGLKViewController.m; sourceTree = "<group>"; };
+		6628E2091B39D98600020E56 /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
+		6628E20A1B39D98600020E56 /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
+		6628E20B1B39D98600020E56 /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
+		6628E20C1B39D98600020E56 /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
+		6628E20D1B39D98600020E56 /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
+		6628E20E1B39D98600020E56 /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
+		6628E20F1B39D98600020E56 /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
+		6628E2101B39D98600020E56 /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
+		6628E2111B39D98600020E56 /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
+		6628E2121B39D98600020E56 /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
+		6628E2131B39D98600020E56 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
+		6628E2141B39D98600020E56 /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
+		6628E2161B39D98600020E56 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
+		6628E2171B39D98600020E56 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		6628E22A1B39F7A800020E56 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard.storyboard; sourceTree = "<group>"; };
-		667558B71B3B60B80013E67E /* EZAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudio.h; sourceTree = "<group>"; };
-		667558B81B3B60B80013E67E /* EZAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudio.m; sourceTree = "<group>"; };
-		667558B91B3B60B80013E67E /* EZAudioDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDevice.h; sourceTree = "<group>"; };
-		667558BA1B3B60B80013E67E /* EZAudioDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDevice.m; sourceTree = "<group>"; };
-		667558BB1B3B60B80013E67E /* EZAudioDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioDisplayLink.h; sourceTree = "<group>"; };
-		667558BC1B3B60B80013E67E /* EZAudioDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioDisplayLink.m; sourceTree = "<group>"; };
-		667558BD1B3B60B80013E67E /* EZAudioFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFile.h; sourceTree = "<group>"; };
-		667558BE1B3B60B80013E67E /* EZAudioFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFile.m; sourceTree = "<group>"; };
-		667558BF1B3B60B80013E67E /* EZAudioFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatConverter.h; sourceTree = "<group>"; };
-		667558C01B3B60B80013E67E /* EZAudioFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatConverter.m; sourceTree = "<group>"; };
-		667558C11B3B60B80013E67E /* EZAudioFloatData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioFloatData.h; sourceTree = "<group>"; };
-		667558C21B3B60B80013E67E /* EZAudioFloatData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioFloatData.m; sourceTree = "<group>"; };
-		667558C31B3B60B80013E67E /* EZAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlayer.h; sourceTree = "<group>"; };
-		667558C41B3B60B80013E67E /* EZAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlayer.m; sourceTree = "<group>"; };
-		667558C51B3B60B80013E67E /* EZAudioPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlot.h; sourceTree = "<group>"; };
-		667558C61B3B60B80013E67E /* EZAudioPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlot.m; sourceTree = "<group>"; };
-		667558C71B3B60B80013E67E /* EZAudioPlotGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioPlotGL.h; sourceTree = "<group>"; };
-		667558C81B3B60B80013E67E /* EZAudioPlotGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioPlotGL.m; sourceTree = "<group>"; };
-		667558CB1B3B60B80013E67E /* EZAudioUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAudioUtilities.h; sourceTree = "<group>"; };
-		667558CC1B3B60B80013E67E /* EZAudioUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZAudioUtilities.m; sourceTree = "<group>"; };
-		667558CD1B3B60B80013E67E /* EZMicrophone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMicrophone.h; sourceTree = "<group>"; };
-		667558CE1B3B60B80013E67E /* EZMicrophone.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMicrophone.m; sourceTree = "<group>"; };
-		667558CF1B3B60B80013E67E /* EZOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOutput.h; sourceTree = "<group>"; };
-		667558D01B3B60B80013E67E /* EZOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZOutput.m; sourceTree = "<group>"; };
-		667558D11B3B60B80013E67E /* EZPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlot.h; sourceTree = "<group>"; };
-		667558D21B3B60B80013E67E /* EZPlot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZPlot.m; sourceTree = "<group>"; };
-		667558D31B3B60B80013E67E /* EZRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecorder.h; sourceTree = "<group>"; };
-		667558D41B3B60B80013E67E /* EZRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRecorder.m; sourceTree = "<group>"; };
-		667558D51B3B60B80013E67E /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
-		667558D61B3B60B80013E67E /* TPCircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TPCircularBuffer.h; sourceTree = "<group>"; };
-		667558D81B3B60B80013E67E /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = "<group>"; };
-		667558D91B3B60B80013E67E /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		9417A6C618658FB500D9D37B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		9417A6C818658FC000D9D37B /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
 		9417A6D0186591CA00D9D37B /* simple-drum-beat.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "simple-drum-beat.wav"; path = "../../../simple-drum-beat.wav"; sourceTree = "<group>"; };
@@ -139,50 +142,52 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		667558B41B3B60B80013E67E /* EZAudio */ = {
+		6628E1F41B39D98600020E56 /* EZAudio */ = {
 			isa = PBXGroup;
 			children = (
-				667558B71B3B60B80013E67E /* EZAudio.h */,
-				667558B81B3B60B80013E67E /* EZAudio.m */,
-				667558B91B3B60B80013E67E /* EZAudioDevice.h */,
-				667558BA1B3B60B80013E67E /* EZAudioDevice.m */,
-				667558BB1B3B60B80013E67E /* EZAudioDisplayLink.h */,
-				667558BC1B3B60B80013E67E /* EZAudioDisplayLink.m */,
-				667558BD1B3B60B80013E67E /* EZAudioFile.h */,
-				667558BE1B3B60B80013E67E /* EZAudioFile.m */,
-				667558BF1B3B60B80013E67E /* EZAudioFloatConverter.h */,
-				667558C01B3B60B80013E67E /* EZAudioFloatConverter.m */,
-				667558C11B3B60B80013E67E /* EZAudioFloatData.h */,
-				667558C21B3B60B80013E67E /* EZAudioFloatData.m */,
-				667558C31B3B60B80013E67E /* EZAudioPlayer.h */,
-				667558C41B3B60B80013E67E /* EZAudioPlayer.m */,
-				667558C51B3B60B80013E67E /* EZAudioPlot.h */,
-				667558C61B3B60B80013E67E /* EZAudioPlot.m */,
-				667558C71B3B60B80013E67E /* EZAudioPlotGL.h */,
-				667558C81B3B60B80013E67E /* EZAudioPlotGL.m */,
-				667558CB1B3B60B80013E67E /* EZAudioUtilities.h */,
-				667558CC1B3B60B80013E67E /* EZAudioUtilities.m */,
-				667558CD1B3B60B80013E67E /* EZMicrophone.h */,
-				667558CE1B3B60B80013E67E /* EZMicrophone.m */,
-				667558CF1B3B60B80013E67E /* EZOutput.h */,
-				667558D01B3B60B80013E67E /* EZOutput.m */,
-				667558D11B3B60B80013E67E /* EZPlot.h */,
-				667558D21B3B60B80013E67E /* EZPlot.m */,
-				667558D31B3B60B80013E67E /* EZRecorder.h */,
-				667558D41B3B60B80013E67E /* EZRecorder.m */,
-				667558D51B3B60B80013E67E /* TPCircularBuffer.c */,
-				667558D61B3B60B80013E67E /* TPCircularBuffer.h */,
-				667558D71B3B60B80013E67E /* VERSION */,
+				6628E1F51B39D98600020E56 /* AEFloatConverter.h */,
+				6628E1F61B39D98600020E56 /* AEFloatConverter.m */,
+				6628E1F71B39D98600020E56 /* EZAudio.h */,
+				6628E1F81B39D98600020E56 /* EZAudio.m */,
+				6628E1F91B39D98600020E56 /* EZAudioDevice.h */,
+				6628E1FA1B39D98600020E56 /* EZAudioDevice.m */,
+				6628E1FB1B39D98600020E56 /* EZAudioFile.h */,
+				6628E1FC1B39D98600020E56 /* EZAudioFile.m */,
+				6628E1FD1B39D98600020E56 /* EZAudioFloatConverter.h */,
+				6628E1FE1B39D98600020E56 /* EZAudioFloatConverter.m */,
+				6628E1FF1B39D98600020E56 /* EZAudioFloatData.h */,
+				6628E2001B39D98600020E56 /* EZAudioFloatData.m */,
+				6628E2011B39D98600020E56 /* EZAudioPlayer.h */,
+				6628E2021B39D98600020E56 /* EZAudioPlayer.m */,
+				6628E2031B39D98600020E56 /* EZAudioPlot.h */,
+				6628E2041B39D98600020E56 /* EZAudioPlot.m */,
+				6628E2051B39D98600020E56 /* EZAudioPlotGL.h */,
+				6628E2061B39D98600020E56 /* EZAudioPlotGL.m */,
+				6628E2071B39D98600020E56 /* EZAudioPlotGLKViewController.h */,
+				6628E2081B39D98600020E56 /* EZAudioPlotGLKViewController.m */,
+				6628E2091B39D98600020E56 /* EZAudioUtilities.h */,
+				6628E20A1B39D98600020E56 /* EZAudioUtilities.m */,
+				6628E20B1B39D98600020E56 /* EZMicrophone.h */,
+				6628E20C1B39D98600020E56 /* EZMicrophone.m */,
+				6628E20D1B39D98600020E56 /* EZOutput.h */,
+				6628E20E1B39D98600020E56 /* EZOutput.m */,
+				6628E20F1B39D98600020E56 /* EZPlot.h */,
+				6628E2101B39D98600020E56 /* EZPlot.m */,
+				6628E2111B39D98600020E56 /* EZRecorder.h */,
+				6628E2121B39D98600020E56 /* EZRecorder.m */,
+				6628E2131B39D98600020E56 /* TPCircularBuffer.c */,
+				6628E2141B39D98600020E56 /* TPCircularBuffer.h */,
+				6628E2151B39D98600020E56 /* VERSION */,
 			);
 			name = EZAudio;
 			path = ../../../../EZAudio;
 			sourceTree = "<group>";
 		};
-		667558D71B3B60B80013E67E /* VERSION */ = {
+		6628E2151B39D98600020E56 /* VERSION */ = {
 			isa = PBXGroup;
 			children = (
-				667558D81B3B60B80013E67E /* CHANGELOG */,
-				667558D91B3B60B80013E67E /* VERSION */,
+				6628E2161B39D98600020E56 /* CHANGELOG */,
+				6628E2171B39D98600020E56 /* VERSION */,
 			);
 			path = VERSION;
 			sourceTree = "<group>";
@@ -223,7 +228,7 @@
 		944D03E2186038A60076EF7A /* EZAudioPlayFileExample */ = {
 			isa = PBXGroup;
 			children = (
-				667558B41B3B60B80013E67E /* EZAudio */,
+				6628E1F41B39D98600020E56 /* EZAudio */,
 				944D03EB186038A60076EF7A /* AppDelegate.h */,
 				944D03EC186038A60076EF7A /* AppDelegate.m */,
 				6628E22A1B39F7A800020E56 /* MainStoryboard.storyboard */,
@@ -343,10 +348,10 @@
 			files = (
 				6628E22B1B39F7A800020E56 /* MainStoryboard.storyboard in Resources */,
 				9417A6D1186591CA00D9D37B /* simple-drum-beat.wav in Resources */,
+				6628E2291B39D98600020E56 /* VERSION in Resources */,
 				944D03F8186038A60076EF7A /* Images.xcassets in Resources */,
-				667558EC1B3B60B80013E67E /* VERSION in Resources */,
 				944D03E7186038A60076EF7A /* InfoPlist.strings in Resources */,
-				667558EB1B3B60B80013E67E /* CHANGELOG in Resources */,
+				6628E2281B39D98600020E56 /* CHANGELOG in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -365,24 +370,25 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				667558E21B3B60B80013E67E /* EZAudioPlot.m in Sources */,
-				667558E11B3B60B80013E67E /* EZAudioPlayer.m in Sources */,
+				6628E2261B39D98600020E56 /* EZRecorder.m in Sources */,
 				944D03ED186038A60076EF7A /* AppDelegate.m in Sources */,
-				667558E31B3B60B80013E67E /* EZAudioPlotGL.m in Sources */,
-				667558DE1B3B60B80013E67E /* EZAudioFile.m in Sources */,
-				667558E71B3B60B80013E67E /* EZOutput.m in Sources */,
-				667558E51B3B60B80013E67E /* EZAudioUtilities.m in Sources */,
-				667558E81B3B60B80013E67E /* EZPlot.m in Sources */,
+				6628E21C1B39D98600020E56 /* EZAudioFloatConverter.m in Sources */,
+				6628E21D1B39D98600020E56 /* EZAudioFloatData.m in Sources */,
+				6628E2181B39D98600020E56 /* AEFloatConverter.m in Sources */,
+				6628E21B1B39D98600020E56 /* EZAudioFile.m in Sources */,
+				6628E2241B39D98600020E56 /* EZOutput.m in Sources */,
+				6628E2201B39D98600020E56 /* EZAudioPlotGL.m in Sources */,
+				6628E2271B39D98600020E56 /* TPCircularBuffer.c in Sources */,
+				6628E21F1B39D98600020E56 /* EZAudioPlot.m in Sources */,
 				944D043D1860398B0076EF7A /* PlayFileViewController.m in Sources */,
-				667558E91B3B60B80013E67E /* EZRecorder.m in Sources */,
-				667558E01B3B60B80013E67E /* EZAudioFloatData.m in Sources */,
-				667558DF1B3B60B80013E67E /* EZAudioFloatConverter.m in Sources */,
-				667558DD1B3B60B80013E67E /* EZAudioDisplayLink.m in Sources */,
-				667558E61B3B60B80013E67E /* EZMicrophone.m in Sources */,
-				667558DC1B3B60B80013E67E /* EZAudioDevice.m in Sources */,
+				6628E2231B39D98600020E56 /* EZMicrophone.m in Sources */,
+				6628E21E1B39D98600020E56 /* EZAudioPlayer.m in Sources */,
+				6628E21A1B39D98600020E56 /* EZAudioDevice.m in Sources */,
 				944D03E9186038A60076EF7A /* main.m in Sources */,
-				667558EA1B3B60B80013E67E /* TPCircularBuffer.c in Sources */,
-				667558DB1B3B60B80013E67E /* EZAudio.m in Sources */,
+				6628E2251B39D98600020E56 /* EZPlot.m in Sources */,
+				6628E2191B39D98600020E56 /* EZAudio.m in Sources */,
+				6628E2221B39D98600020E56 /* EZAudioUtilities.m in Sources */,
+				6628E2211B39D98600020E56 /* EZAudioPlotGLKViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -506,7 +512,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EZAudioPlayFileExample/EZAudioPlayFileExample-Prefix.pch";
 				INFOPLIST_FILE = "EZAudioPlayFileExample/EZAudioPlayFileExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -520,7 +525,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "EZAudioPlayFileExample/EZAudioPlayFileExample-Prefix.pch";
 				INFOPLIST_FILE = "EZAudioPlayFileExample/EZAudioPlayFileExample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};