More Spectrum Analyzer work

Ported error handling from the previous Audjustable player.

ExampleApp/ExampleApp.xcodeproj/project.pbxproj

@@ -24,7 +24,10 @@
 		A111596C188D6C8100641365 /* sample.m4a in Resources */ = {isa = PBXBuildFile; fileRef = A111596B188D6C8100641365 /* sample.m4a */; };
 		A111596F188D6DB100641365 /* SampleQueueId.m in Sources */ = {isa = PBXBuildFile; fileRef = A111596E188D6DB100641365 /* SampleQueueId.m */; };
 		A142571D189079BE005F0129 /* airplane.aac in Resources */ = {isa = PBXBuildFile; fileRef = A142571C18907861005F0129 /* airplane.aac */; };
+		A17FFB6318A0028300BAA7FF /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A17FFB6218A0028300BAA7FF /* AudioToolbox.framework */; };
+		A17FFB6918A002E400BAA7FF /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1F5E491189EB3F20070B03F /* AVFoundation.framework */; };
 		A1EBEE64188DE34500681B04 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1EBEE63188DE34500681B04 /* SystemConfiguration.framework */; };
+		A1F3410A1908185900CA7755 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1F341091908185900CA7755 /* Accelerate.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -61,7 +64,11 @@
 		A111596D188D6DB100641365 /* SampleQueueId.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SampleQueueId.h; sourceTree = "<group>"; };
 		A111596E188D6DB100641365 /* SampleQueueId.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SampleQueueId.m; sourceTree = "<group>"; };
 		A142571C18907861005F0129 /* airplane.aac */ = {isa = PBXFileReference; lastKnownFileType = file; path = airplane.aac; sourceTree = "<group>"; };
+		A17FFB6218A0028300BAA7FF /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		A1EBEE63188DE34500681B04 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		A1F341091908185900CA7755 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
+		A1F5E48F189EB3CB0070B03F /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
+		A1F5E491189EB3F20070B03F /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -69,6 +76,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A1F3410A1908185900CA7755 /* Accelerate.framework in Frameworks */,
+				A17FFB6918A002E400BAA7FF /* AVFoundation.framework in Frameworks */,
+				A17FFB6318A0028300BAA7FF /* AudioToolbox.framework in Frameworks */,
 				A1EBEE64188DE34500681B04 /* SystemConfiguration.framework in Frameworks */,
 				A1115964188D691500641365 /* libStreamingKit.a in Frameworks */,
 				A1115937188D686000641365 /* CoreGraphics.framework in Frameworks */,
@@ -112,6 +122,10 @@
 		A1115933188D686000641365 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				A1F341091908185900CA7755 /* Accelerate.framework */,
+				A17FFB6218A0028300BAA7FF /* AudioToolbox.framework */,
+				A1F5E491189EB3F20070B03F /* AVFoundation.framework */,
+				A1F5E48F189EB3CB0070B03F /* AudioUnit.framework */,
 				A1EBEE63188DE34500681B04 /* SystemConfiguration.framework */,
 				A1115963188D691500641365 /* libStreamingKit.a */,
 				A1115934188D686000641365 /* Foundation.framework */,
@@ -220,7 +234,7 @@
 		A1115929188D686000641365 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = "Thong Nguyen";
 				TargetAttributes = {
 					A111594B188D686000641365 = {
@@ -322,7 +336,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -356,7 +369,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../StreamingKit/StreamingKit",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -367,7 +380,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -395,7 +407,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../StreamingKit/StreamingKit",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -405,13 +417,14 @@
 		A111595E188D686000641365 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ExampleApp/ExampleApp-Prefix.pch";
 				INFOPLIST_FILE = "ExampleApp/ExampleApp-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				LLVM_LTO = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -421,13 +434,13 @@
 		A111595F188D686000641365 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ExampleApp/ExampleApp-Prefix.pch";
 				INFOPLIST_FILE = "ExampleApp/ExampleApp-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				LLVM_LTO = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -437,7 +450,6 @@
 		A1115961188D686000641365 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/ExampleApp.app/ExampleApp";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -460,7 +472,6 @@
 		A1115962188D686000641365 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/ExampleApp.app/ExampleApp";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",

ExampleApp/ExampleApp/AppDelegate.m

@@ -21,24 +21,27 @@
 
 @implementation AppDelegate
 
-
 -(BOOL) application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
 {
     NSError* error;
     
     [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:&error];
+	[[AVAudioSession sharedInstance] setActive:YES error:&error];
+    
+    Float32 bufferLength = 0.1;
+    AudioSessionSetProperty(kAudioSessionProperty_PreferredHardwareIOBufferDuration, sizeof(bufferLength), &bufferLength);
     
     self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
     
 	self.window.backgroundColor = [UIColor whiteColor];
     
-	audioPlayer = [[STKAudioPlayer alloc] initWithOptions:STKAudioPlayerOptionFlushQueueOnSeek];
+	audioPlayer = [[STKAudioPlayer alloc] initWithOptions:(STKAudioPlayerOptions){ .flushQueueOnSeek = YES, .enableVolumeMixer = NO, .equalizerBandFrequencies = {50, 100, 200, 400, 800, 1600, 2600, 16000} }];
 	audioPlayer.meteringEnabled = YES;
+	audioPlayer.volume = 1;
 	
-	AudioPlayerView* audioPlayerView = [[AudioPlayerView alloc] initWithFrame:self.window.bounds];
+	AudioPlayerView* audioPlayerView = [[AudioPlayerView alloc] initWithFrame:self.window.bounds andAudioPlayer:audioPlayer];
     
 	audioPlayerView.delegate = self;
-	audioPlayerView.audioPlayer = audioPlayer;
     
     [[UIApplication sharedApplication] beginReceivingRemoteControlEvents];
     [self becomeFirstResponder];

ExampleApp/ExampleApp/AudioPlayerView.h

@@ -51,6 +51,7 @@
     UILabel* label;
     UILabel* statusLabel;
 	UISlider* slider;
+    UISwitch* enableEqSwitch;
     UISwitch* repeatSwitch;
 	UIButton* muteButton;
 	UIButton* playButton;
@@ -65,4 +66,6 @@
 @property (readwrite, retain) STKAudioPlayer* audioPlayer;
 @property (readwrite, unsafe_unretained) id<AudioPlayerViewDelegate> delegate;
 
+- (id)initWithFrame:(CGRect)frame andAudioPlayer:(STKAudioPlayer*)audioPlayer;
+
 @end

ExampleApp/ExampleApp/AudioPlayerView.m

@@ -40,6 +40,9 @@
 ///
 
 @interface AudioPlayerView()
+{
+    NSMutableArray* meters;
+}
 -(void) setupTimer;
 -(void) updateControls;
 @end
@@ -47,12 +50,16 @@
 @implementation AudioPlayerView
 @synthesize audioPlayer, delegate;
 
-- (id)initWithFrame:(CGRect)frame
+- (id)initWithFrame:(CGRect)frame andAudioPlayer:(STKAudioPlayer*)audioPlayerIn
 {
     self = [super initWithFrame:frame];
 	
     if (self)
 	{
+        self.audioPlayer = audioPlayerIn;
+        
+        self.audioPlayer.spectrumAnalyzerEnabled = YES;
+        
 		CGSize size = CGSizeMake(220, 50);
 		
 		playFromHTTPButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
@@ -97,7 +104,12 @@
         
         size = CGSizeMake(80, 50);
         
-        repeatSwitch = [[UISwitch alloc] initWithFrame:CGRectMake((320 - size.width) / 2, frame.size.height * 0.15 + 180, size.width, size.height)];
+        repeatSwitch = [[UISwitch alloc] initWithFrame:CGRectMake(30, frame.size.height * 0.15 + 180, size.width, size.height)];
+        
+        enableEqSwitch = [[UISwitch alloc] initWithFrame:CGRectMake(320 - size.width - 30, frame.size.height * 0.15 + 180, size.width, size.height)];
+        enableEqSwitch.on = audioPlayer.equalizerEnabled;
+        
+        [enableEqSwitch addTarget:self action:@selector(onEnableEqSwitch) forControlEvents:UIControlEventAllTouchEvents];
 
         label = [[UILabel alloc] initWithFrame:CGRectMake(0, slider.frame.origin.y + slider.frame.size.height + 10, frame.size.width, 25)];
 		
@@ -107,11 +119,24 @@
 		
         statusLabel.textAlignment = NSTextAlignmentCenter;
 		
-		
+        meters = [[NSMutableArray alloc] init];
+        
 		meter = [[UIView alloc] initWithFrame:CGRectMake(0, 450, 0, 20)];
 		
 		meter.backgroundColor = [UIColor greenColor];
         
+        for (int i = 0; i < 256; i++)
+        {
+            UIView* freqMeter = [[UIView alloc] initWithFrame:CGRectMake(i, self.bounds.size.height, 1, 0)];
+            
+            freqMeter.backgroundColor = [UIColor blueColor];
+            
+            [self addSubview:freqMeter];
+            [meters addObject:freqMeter];
+            
+            [self sendSubviewToBack:freqMeter];
+        }
+		
 		[self addSubview:slider];
 		[self addSubview:playButton];
 		[self addSubview:playFromHTTPButton];
@@ -124,6 +149,7 @@
         [self addSubview:stopButton];
 		[self addSubview:meter];
 		[self addSubview:muteButton];
+        [self addSubview:enableEqSwitch];
         
 		[self setupTimer];
 		[self updateControls];
@@ -132,6 +158,11 @@
     return self;
 }
 
+-(void) onEnableEqSwitch
+{
+    audioPlayer.equalizerEnabled = self->enableEqSwitch.on;
+}
+
 -(void) sliderChanged
 {
 	if (!audioPlayer)
@@ -146,7 +177,7 @@
 
 -(void) setupTimer
 {
-	timer = [NSTimer timerWithTimeInterval:0.01 target:self selector:@selector(tick) userInfo:nil repeats:YES];
+	timer = [NSTimer timerWithTimeInterval:0.001 target:self selector:@selector(tick) userInfo:nil repeats:YES];
 	
 	[[NSRunLoop currentRunLoop] addTimer:timer forMode:NSRunLoopCommonModes];
 }
@@ -181,9 +212,18 @@
     
     statusLabel.text = audioPlayer.state == STKAudioPlayerStateBuffering ? @"buffering" : @"";
 	
-	CGFloat newWidth = 320 * (([audioPlayer averagePowerInDecibelsForChannel:1] + 60) / 60);
+	CGFloat newWidth = 320 * (([audioPlayer testPowerWithIndex:100] + 96) / 96);
 	
 	meter.frame = CGRectMake(0, 460, newWidth, 20);
+    
+    for (int i = 0; i < 256; i++)
+    {
+        UIView* freqMeter = [meters objectAtIndex:i];
+        
+        CGFloat height = 200 * (([audioPlayer testPowerWithIndex:i] + 96) / 96);
+        
+        freqMeter.frame = CGRectMake(freqMeter.frame.origin.x, self.bounds.size.height - height, 1, height);
+    }
 }
 
 -(void) playFromHTTPButtonTouched

ExampleAppMac/ExampleAppMac.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		A17FFB6818A002BC00BAA7FF /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1A499ED189E793700E2A2E2 /* AudioUnit.framework */; };
 		A1A499A5189E765800E2A2E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1A499A4189E765800E2A2E2 /* Cocoa.framework */; };
 		A1A499AF189E765800E2A2E2 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A1A499AD189E765800E2A2E2 /* InfoPlist.strings */; };
 		A1A499B1189E765800E2A2E2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A1A499B0189E765800E2A2E2 /* main.m */; };
@@ -26,7 +27,6 @@
 		A1A499F9189E7A3500E2A2E2 /* libStreamingKitMac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A1A499F8189E7A3500E2A2E2 /* libStreamingKitMac.a */; };
 		A1A499FA189E7A5600E2A2E2 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1A499F1189E799400E2A2E2 /* AudioToolbox.framework */; };
 		A1A499FC189E7A6D00E2A2E2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1A499FB189E7A6D00E2A2E2 /* SystemConfiguration.framework */; };
-		A1A499FD189E7BFC00E2A2E2 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1A499ED189E793700E2A2E2 /* AudioUnit.framework */; };
 		A1A49A01189E82EC00E2A2E2 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1A49A00189E82EC00E2A2E2 /* QuartzCore.framework */; };
 /* End PBXBuildFile section */
 
@@ -41,6 +41,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		A17FFB6618A002AD00BAA7FF /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		A1A499A1189E765800E2A2E2 /* ExampleAppMac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ExampleAppMac.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A1A499A4189E765800E2A2E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		A1A499A7189E765800E2A2E2 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -60,12 +61,12 @@
 		A1A499CA189E765800E2A2E2 /* ExampleAppMacTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ExampleAppMacTests-Info.plist"; sourceTree = "<group>"; };
 		A1A499CC189E765800E2A2E2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		A1A499CE189E765800E2A2E2 /* ExampleAppMacTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExampleAppMacTests.m; sourceTree = "<group>"; };
-		A1A499EA189E76BD00E2A2E2 /* libStreamingKitMac.a */ = {isa = PBXFileReference; lastKnownFileType = file; name = libStreamingKitMac.a; path = ../StreamingKit/build/Debug/libStreamingKitMac.a; sourceTree = "<group>"; };
+		A1A499EA189E76BD00E2A2E2 /* libStreamingKitMac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libStreamingKitMac.a; path = ../StreamingKit/build/Debug/libStreamingKitMac.a; sourceTree = "<group>"; };
 		A1A499ED189E793700E2A2E2 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
 		A1A499EF189E793D00E2A2E2 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		A1A499F1189E799400E2A2E2 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		A1A499F4189E79CB00E2A2E2 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; };
-		A1A499F8189E7A3500E2A2E2 /* libStreamingKitMac.a */ = {isa = PBXFileReference; lastKnownFileType = file; name = libStreamingKitMac.a; path = ../StreamingKit/build/Debug/libStreamingKitMac.a; sourceTree = "<group>"; };
+		A1A499F8189E7A3500E2A2E2 /* libStreamingKitMac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libStreamingKitMac.a; path = ../StreamingKit/build/Debug/libStreamingKitMac.a; sourceTree = "<group>"; };
 		A1A499FB189E7A6D00E2A2E2 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		A1A499FE189E82DD00E2A2E2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		A1A49A00189E82EC00E2A2E2 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -76,8 +77,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A17FFB6818A002BC00BAA7FF /* AudioUnit.framework in Frameworks */,
 				A1A49A01189E82EC00E2A2E2 /* QuartzCore.framework in Frameworks */,
-				A1A499FD189E7BFC00E2A2E2 /* AudioUnit.framework in Frameworks */,
 				A1A499FC189E7A6D00E2A2E2 /* SystemConfiguration.framework in Frameworks */,
 				A1A499FA189E7A5600E2A2E2 /* AudioToolbox.framework in Frameworks */,
 				A1A499F9189E7A3500E2A2E2 /* libStreamingKitMac.a in Frameworks */,
@@ -124,6 +125,7 @@
 		A1A499A3189E765800E2A2E2 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				A17FFB6618A002AD00BAA7FF /* AVFoundation.framework */,
 				A1A49A00189E82EC00E2A2E2 /* QuartzCore.framework */,
 				A1A499FE189E82DD00E2A2E2 /* CoreGraphics.framework */,
 				A1A499FB189E7A6D00E2A2E2 /* SystemConfiguration.framework */,
@@ -430,7 +432,7 @@
 					"$(SRCROOT)/../StreamingKit/StreamingKit",
 				);
 				INFOPLIST_FILE = "ExampleAppMac/ExampleAppMac-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = "";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -450,7 +452,7 @@
 					"$(SRCROOT)/../StreamingKit/StreamingKit",
 				);
 				INFOPLIST_FILE = "ExampleAppMac/ExampleAppMac-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = "";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;

ExampleAppMac/ExampleAppMac/AppDelegate.m

@@ -40,13 +40,22 @@
 	[[self.window contentView] addSubview:playFromHTTPButton];
 	[[self.window contentView] addSubview:meter];
 	
-	audioPlayer = [[STKAudioPlayer alloc] init];
+	audioPlayer = [[STKAudioPlayer alloc] initWithOptions:(STKAudioPlayerOptions){ .enableVolumeMixer = NO, .equalizerBandFrequencies = {50, 100, 200, 400, 800, 1600, 2600, 16000} } ];
 	audioPlayer.delegate = self;
 	audioPlayer.meteringEnabled = YES;
-	
+	audioPlayer.volume = 0.1;
+    
+    [self performSelector:@selector(test) withObject:nil afterDelay:4];
+    [self performSelector:@selector(test) withObject:nil afterDelay:8];
+    
 	[NSTimer scheduledTimerWithTimeInterval:0.01 target:self selector:@selector(tick:) userInfo:nil repeats:YES];
 }
 
+-(void) test
+{
+    audioPlayer.equalizerEnabled = !audioPlayer.equalizerEnabled;
+}
+
 -(void) playFromHTTP
 {
 	[audioPlayer play:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];

README.md

@@ -1,41 +1,66 @@
 ## StreamingKit
 
-StreamingKit (formally Audjustable) is an audio streaming library for iOS and OSX.  StreamingKit uses CoreAudio to decompress and playback audio whilst providing a clean and simple object-oriented API.
+StreamingKit (formally Audjustable) is an audio playback and streaming library for iOS and Mac OSX.  StreamingKit uses CoreAudio to decompress and playback audio (using hardware or software codecs) whilst providing a clean and simple object-oriented API.
 
-The primary motivation of this project was to decouple the input data sources from the actual player logic in order to allow advanced customizable input handling such as HTTP streaming, encryption/decryption, auto-recovery, dynamic-buffering. Along the way other features such as gapless playback were added.
+The primary motivation of this project was to decouple the input data sources from the actual player logic in order to allow advanced customizable input handling such as HTTP streaming, encryption/decryption, auto-recovery, dynamic-buffering. StreamingKit is the only streaming and playback library that supports dead-easy [gapless playback](https://github.com/tumtumtum/StreamingKit/wiki/Gapless-playback) between audio files of differing formats.
 
 ## Main Features
 
-* Simple OOP API
-* Easy to read source
-* Mostly asynchronous API
-* Buffered and gapless playback
-* Easy to implement audio data sources (Local, HTTP, Auto Recovering HTTP DataSources are provided)
+* Free OSS.
+* Simple API.
+* Easy to read source.
+* Carefully multi-threaded to provide a responsive API that won't block your UI thread nor starve the audio buffers.
+* Buffered and gapless playback between all format types.
+* Easy to implement audio data sources (Local, HTTP, AutoRecoveryingHTTP DataSources are provided).
 * Easy to extend DataSource to support adaptive buffering, encryption, etc.
-* Optimised for low CPU/battery usage
+* Optimised for low CPU/battery usage (0% - 1% CPU usage when streaming).
+* Optimised for linear data sources. Random access sources are required only for seeking.
+* StreamingKit 0.2.0 uses the AudioUnit API rather than the slower AudioQueues API which allows real-time interception of the raw PCM data for features such as level metering, EQ, etc.
+* Power metering
+* Inbuilt equalizer/EQ (iOS 5.0 and above, OSX 10.9 Mavericks and above) with support for dynamically changing/enabling/disabling EQ while playing.
+* Example apps for iOS and Mac OSX provided.
 
 ## Installation
 
-StreamingKit is also available as a [Cocoapod](http://cocoapods.org/?q=StreamingKit) and a static lib. You can also simply manually copy all the source files located inside StreamingKit/StreamingKit/* into your project.
+StreamingKit is available as a [Cocoapod](http://cocoapods.org/?q=StreamingKit). You can also simply copy all the source files located inside StreamingKit/StreamingKit/* into your Xcode project.
 
 ## Example
 
 There are two main classes.  The `STKDataSource` class which is the abstract base class for the various compressed audio data sources. The `STKAudioPlayer` class manages and renders audio from a queue DataSources. By default `STKAudioPlayer` will automatically parse URLs and create the appropriate data source internally.
 
+### Play an MP3 over HTTP
+
+
 ```objective-c
-
-
 STKAudioPlayer* audioPlayer = [[STKAudioPlayer alloc] init];
-audioPlayer.delegate = self;
 
 [audioPlayer play:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
+```
 
+### Gapless playback
+
+```objective-c
+STKAudioPlayer* audioPlayer = [[STKAudioPlayer alloc] init];
+
+[audioPlayer queue:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
+[audioPlayer queue:@"http://fs.bloom.fm/oss/audiosamples/airplane.aac"];
 
 ```
 
+
+### Intercept PCM data just before its played
+
+```objective-c
+[audioPlayer appendFrameFilterWithName:@"MyCustomFilter" block:^(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UInt32 frameCount, void* frames)
+{
+   ...
+}];
+````
+
+
 ## More
 
-More documentation is available on the project [wiki](https://github.com/tumtumtum/StreamingKit/wiki)
+More documentation is available on the project [Wiki](https://github.com/tumtumtum/StreamingKit/wiki/_pages)
 
 ### Authors and Contributors
-Copyright (c) 2012-2014, Thong Nguyen (@tumtumtum)
+Copyright (c) 2012-2014, Thong Nguyen ([@tumtumtum](http://www.twitter.com/tumtumtum))

StreamingKit-head.podspec

@@ -5,9 +5,12 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/tumtumtum/StreamingKit/"
   s.license      = 'MIT'
   s.author       = { "Thong Nguyen" => "tumtumtum@gmail.com" }
-  s.source       = { :git => "https://github.com/tumtumtum/StreamingKit.git"}
+  s.source       = { :git => "https://github.com/tumtumtum/StreamingKit.git" }
   s.platform     = :ios
   s.requires_arc = true
   s.source_files = 'StreamingKit/StreamingKit/*.{h,m}'
-  s.frameworks   = 'AVFoundation', 'SystemConfiguration', 'CFNetwork', 'CoreFoundation', 'AudioToolbox', 'AudioUnit'
+  s.ios.deployment_target = '4.3'
+  s.ios.frameworks   = 'SystemConfiguration', 'CFNetwork', 'CoreFoundation', 'AudioToolbox'
+  s.osx.deployment_target = '10.7'
+  s.osx.frameworks   = 'SystemConfiguration', 'CFNetwork', 'CoreFoundation', 'AudioToolbox', 'AudioUnit'
 end

StreamingKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "StreamingKit"
-  s.version      = "0.0.13"
+  s.version      = "0.1.19"
   s.summary      = "A fast and extensible audio streamer for iOS and OSX with support for gapless playback and custom (non-HTTP) sources."
   s.homepage     = "https://github.com/tumtumtum/StreamingKit/"
   s.license      = 'MIT'
@@ -9,5 +9,8 @@ Pod::Spec.new do |s|
   s.platform     = :ios
   s.requires_arc = true
   s.source_files = 'StreamingKit/StreamingKit/*.{h,m}'
-  s.frameworks   = 'AVFoundation', 'SystemConfiguration', 'CFNetwork', 'CoreFoundation', 'AudioToolbox', 'AudioUnit'
+  s.ios.deployment_target = '4.3'
+  s.ios.frameworks   = 'SystemConfiguration', 'CFNetwork', 'CoreFoundation', 'AudioToolbox'
+  s.osx.deployment_target = '10.7'
+  s.osx.frameworks   = 'SystemConfiguration', 'CFNetwork', 'CoreFoundation', 'AudioToolbox', 'AudioUnit'
 end

StreamingKit/StreamingKit.xcodeproj/project.pbxproj

@@ -37,6 +37,8 @@
 		A1E7C503188D5E550010896F /* STKDataSourceWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = A1E7C4FA188D5E550010896F /* STKDataSourceWrapper.m */; };
 		A1E7C504188D5E550010896F /* STKHTTPDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = A1E7C4FC188D5E550010896F /* STKHTTPDataSource.m */; };
 		A1E7C505188D5E550010896F /* STKLocalFileDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = A1E7C4FE188D5E550010896F /* STKLocalFileDataSource.m */; };
+		A1F341041908183300CA7755 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1F341031908183300CA7755 /* Accelerate.framework */; };
+		A1F341081908183A00CA7755 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1F341071908183A00CA7755 /* Accelerate.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -125,6 +127,8 @@
 		A1E7C4FD188D5E550010896F /* STKLocalFileDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = STKLocalFileDataSource.h; sourceTree = "<group>"; };
 		A1E7C4FE188D5E550010896F /* STKLocalFileDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = STKLocalFileDataSource.m; sourceTree = "<group>"; };
 		A1E7C507188D62D20010896F /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		A1F341031908183300CA7755 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
+		A1F341071908183A00CA7755 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Accelerate.framework; sourceTree = DEVELOPER_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -132,6 +136,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A1F341081908183A00CA7755 /* Accelerate.framework in Frameworks */,
 				A1A4996B189E744400E2A2E2 /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -150,6 +155,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A1F341041908183300CA7755 /* Accelerate.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -248,6 +254,8 @@
 		A1E7C4CA188D57F50010896F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				A1F341071908183A00CA7755 /* Accelerate.framework */,
+				A1F341031908183300CA7755 /* Accelerate.framework */,
 				A1A499F6189E79EA00E2A2E2 /* AudioToolbox.framework */,
 				A1C9767618981BFE0057F881 /* AudioUnit.framework */,
 				A1E7C507188D62D20010896F /* UIKit.framework */,
@@ -401,7 +409,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = STK;
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = "Thong Nguyen";
 			};
 			buildConfigurationList = A1E7C4C3188D57F50010896F /* Build configuration list for PBXProject "StreamingKit" */;
@@ -565,7 +573,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
@@ -582,7 +590,7 @@
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "StreamingKitMac/StreamingKitMac-Prefix.pch";
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
@@ -635,7 +643,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -663,7 +670,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -673,7 +680,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -695,7 +701,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -704,7 +710,6 @@
 		A1E7C4EC188D57F60010896F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				DSTROOT = /tmp/StreamingKit.dst;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -721,7 +726,6 @@
 		A1E7C4ED188D57F60010896F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				DSTROOT = /tmp/StreamingKit.dst;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -738,7 +742,6 @@
 		A1E7C4EF188D57F60010896F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -759,7 +762,6 @@
 		A1E7C4F0188D57F60010896F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -783,6 +785,7 @@
 				A1A49989189E744500E2A2E2 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		A1A4998D189E744500E2A2E2 /* Build configuration list for PBXNativeTarget "StreamingKitMacTests" */ = {
 			isa = XCConfigurationList;
@@ -791,6 +794,7 @@
 				A1A4998B189E744500E2A2E2 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		A1E7C4C3188D57F50010896F /* Build configuration list for PBXProject "StreamingKit" */ = {
 			isa = XCConfigurationList;

StreamingKit/StreamingKit/STKAudioPlayer.h

@@ -38,7 +38,7 @@
 #import <Foundation/Foundation.h>
 #import <pthread.h>
 #import "STKDataSource.h"
-#include <AudioToolbox/AudioToolbox.h>
+#import <AudioToolbox/AudioToolbox.h>
 
 #if TARGET_OS_IPHONE
 #include "UIKit/UIApplication.h"
@@ -62,6 +62,8 @@ typedef enum
 	STKAudioPlayerStopReasonNone = 0,
 	STKAudioPlayerStopReasonEof,
 	STKAudioPlayerStopReasonUserAction,
+	STKAudioPlayerStopReasonPendingNext,
+	STKAudioPlayerStopReasonDisposed,
 	STKAudioPlayerStopReasonError = 0xffff
 }
 STKAudioPlayerStopReason;
@@ -78,13 +80,34 @@ typedef enum
 }
 STKAudioPlayerErrorCode;
 
-typedef enum
+typedef struct
 {
-	STKAudioPlayerOptionNone = 0,
-	STKAudioPlayerOptionFlushQueueOnSeek = 1
+    /// If YES then seeking a track will cause all pending items to be flushed from the queue
+    BOOL flushQueueOnSeek;
+    /// If YES then volume control will be enabled on iOS
+    BOOL enableVolumeMixer;
+    /// A pointer to a 0 terminated array of band frequencies (iOS 5.0 and later, OSX 10.9 and later)
+    Float32 equalizerBandFrequencies[24];
+	/// The size of the internal I/O read buffer. This data in this buffer is transient and does not need to be larger.
+    UInt32 readBufferSize;
+    /// The size of the decompressed buffer (Default is 10 seconds which uses about 1.7MB of RAM)
+    UInt32 bufferSizeInSeconds;
+    /// Number of seconds of decompressed audio is required before playback first starts for each item (Default is 0.5 seconds. Must be larger than bufferSizeInSeconds)
+    Float32 secondsRequiredToStartPlaying;
+	/// Seconds after a seek is performed before data needs to come in (after which the state will change to playing/buffering)
+    Float32 gracePeriodAfterSeekInSeconds;
+    /// Number of seconds of decompressed audio required before playback resumes after a buffer underrun (Default is 5 seconds. Must be larger than bufferSizeinSeconds)
+    Float32 secondsRequiredToStartPlayingAfterBufferUnderun;
 }
 STKAudioPlayerOptions;
 
+typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UInt32 frameCount, void* frames);
+
+@interface STKFrameFilterEntry : NSObject
+@property (readonly) NSString* name;
+@property (readonly) STKFrameFilter filter;
+@end
+
 @class STKAudioPlayer;
 
 @protocol STKAudioPlayerDelegate <NSObject>
@@ -108,10 +131,11 @@ STKAudioPlayerOptions;
 
 @end
 
-typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UInt32 frameCount, void* frames);
-
 @interface STKAudioPlayer : NSObject<STKDataSourceDelegate>
 
+/// Gets or sets the volume (ranges 0 - 1.0).
+/// On iOS the STKAudioPlayerOptionEnableMultichannelMixer option must be enabled for volume to work.
+@property (readwrite) Float32 volume;
 /// Gets or sets the player muted state
 @property (readwrite) BOOL muted;
 /// Gets the current item duration in seconds
@@ -120,6 +144,10 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn
 @property (readonly) double progress;
 /// Enables or disables peak and average decibel meteting
 @property (readwrite) BOOL meteringEnabled;
+/// Enables or disables the EQ
+@property (readwrite) BOOL equalizerEnabled;
+/// Enables or disables the spectrum analyzer (fft)
+@property (readwrite) BOOL spectrumAnalyzerEnabled;
 /// Returns an array of STKFrameFilterEntry objects representing the filters currently in use
 @property (readonly) NSArray* frameFilters;
 /// Returns the items pending to be played (includes buffering and upcoming items but does not include the current item)
@@ -149,16 +177,40 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn
 /// Initializes a new STKAudioPlayer with the given options
 -(id) initWithOptions:(STKAudioPlayerOptions)optionsIn;
 
-/// Plays an item from the given URL (all pending queued items are removed)
+/// Plays an item from the given URL string (all pending queued items are removed).
+/// The NSString is used as the queue item ID
 -(void) play:(NSString*)urlString;
 
 /// Plays an item from the given URL (all pending queued items are removed)
--(void) playWithURL:(NSURL*)url;
+-(void) play:(NSString*)urlString withQueueItemID:(NSObject*)queueItemId;
+
+/// Plays an item from the given URL (all pending queued items are removed)
+/// The NSURL is used as the queue item ID
+-(void) playURL:(NSURL*)url;
+
+/// Plays an item from the given URL (all pending queued items are removed)
+-(void) playURL:(NSURL*)url withQueueItemID:(NSObject*)queueItemId;
 
 /// Plays the given item (all pending queued items are removed)
--(void) playWithDataSource:(STKDataSource*)dataSource;
+/// The STKDataSource is used as the queue item ID
+-(void) playDataSource:(STKDataSource*)dataSource;
 
-/// Queues a DataSource with te given Item ID for playback
+/// Plays the given item (all pending queued items are removed)
+-(void) playDataSource:(STKDataSource*)dataSource withQueueItemID:(NSObject*)queueItemId;
+
+/// Queues the URL string for playback and uses the NSString as the queueItemID
+-(void) queue:(NSString*)urlString;
+
+/// Queues the URL string for playback with the given queueItemID
+-(void) queue:(NSString*)urlString withQueueItemId:(NSObject*)queueItemId;
+
+/// Queues the URL for playback and uses the NSURL as the queueItemID
+-(void) queueURL:(NSURL*)url;
+
+/// Queues the URL for playback with the given queueItemID
+-(void) queueURL:(NSURL*)url withQueueItemId:(NSObject*)queueItemId;
+
+/// Queues a DataSource with the given queueItemId
 -(void) queueDataSource:(STKDataSource*)dataSource withQueueItemId:(NSObject*)queueItemId;
 
 /// Plays the given item (all pending queued items are removed)
@@ -210,4 +262,9 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn
 /// Return values are between -60 (low) and 0 (high).
 -(float) averagePowerInDecibelsForChannel:(NSUInteger)channelNumber;
 
+/// Sets the gain value (from -96 low to +24 high) for an equalizer band (0 based index)
+-(void) setGain:(float)gain forEqualizerBand:(int)bandIndex;
+
+-(float) testPowerWithIndex:(int)index;
+
 @end

StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.h

@@ -36,6 +36,13 @@
 #import "STKHTTPDataSource.h"
 #import "STKDataSourceWrapper.h"
 
+typedef struct
+{
+    int watchdogPeriodSeconds;
+	int inactivePeriodBeforeReconnectSeconds;
+}
+STKAutoRecoveringHTTPDataSourceOptions;
+
 @interface STKAutoRecoveringHTTPDataSource : STKDataSourceWrapper
 
 -(id) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSource;

StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m

@@ -38,18 +38,38 @@
 #import <arpa/inet.h>
 #import <ifaddrs.h>
 #import <netdb.h>
+#import "mach/mach_time.h"
 #import <Foundation/Foundation.h>
 #import <SystemConfiguration/SystemConfiguration.h>
 #import "STKAutoRecoveringHTTPDataSource.h"
 
-#define MAX_IMMEDIATE_RECONNECT_ATTEMPTS (2)
+#define DEFAULT_WATCHDOG_PERIOD_SECONDS (8)
+#define DEFAULT_INACTIVE_PERIOD_BEFORE_RECONNECT_SECONDS (15)
+
+static uint64_t GetTickCount(void)
+{
+    static mach_timebase_info_data_t sTimebaseInfo;
+    uint64_t machTime = mach_absolute_time();
+    
+    if (sTimebaseInfo.denom == 0 )
+    {
+        (void) mach_timebase_info(&sTimebaseInfo);
+    }
+    
+    uint64_t millis = ((machTime / 1000000) * sTimebaseInfo.numer) / sTimebaseInfo.denom;
+    
+    return millis;
+}
 
 @interface STKAutoRecoveringHTTPDataSource()
 {
     int serial;
 	int waitSeconds;
+    NSTimer* timeoutTimer;
     BOOL waitingForNetwork;
+    uint64_t ticksWhenLastDataReceived;
     SCNetworkReachabilityRef reachabilityRef;
+    STKAutoRecoveringHTTPDataSourceOptions options;
 }
 
 -(void) reachabilityChanged;
@@ -66,6 +86,19 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
     }
 }
 
+static void PopulateOptionsWithDefault(STKAutoRecoveringHTTPDataSourceOptions* options)
+{
+    if (options->watchdogPeriodSeconds == 0)
+    {
+        options->watchdogPeriodSeconds = DEFAULT_WATCHDOG_PERIOD_SECONDS;
+    }
+    
+    if (options->inactivePeriodBeforeReconnectSeconds == 0)
+    {
+        options->inactivePeriodBeforeReconnectSeconds = DEFAULT_INACTIVE_PERIOD_BEFORE_RECONNECT_SECONDS;
+    }
+}
+
 @implementation STKAutoRecoveringHTTPDataSource
 
 -(STKHTTPDataSource*) innerHTTPDataSource
@@ -79,6 +112,11 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
 }
 
 -(id) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn
+{
+    return [self initWithHTTPDataSource:innerDataSourceIn andOptions:(STKAutoRecoveringHTTPDataSourceOptions){}];
+}
+
+-(id) initWithHTTPDataSource:(STKHTTPDataSource*)innerDataSourceIn andOptions:(STKAutoRecoveringHTTPDataSourceOptions)optionsIn
 {
     if (self = [super initWithDataSource:innerDataSourceIn])
     {
@@ -90,6 +128,10 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
         zeroAddress.sin_len = sizeof(zeroAddress);
         zeroAddress.sin_family = AF_INET;
         
+        PopulateOptionsWithDefault(&optionsIn);
+        
+        self->options = optionsIn;
+        
         reachabilityRef = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (const struct sockaddr*)&zeroAddress);
     }
     
@@ -117,14 +159,70 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
     [super registerForEvents:runLoop];
     [self startNotifierOnRunLoop:runLoop];
     
+    if (timeoutTimer)
+    {
+        [timeoutTimer invalidate];
+        timeoutTimer = nil;
+    }
+    
+	ticksWhenLastDataReceived = GetTickCount();
+	
+    [self createTimeoutTimer];
+    
     return YES;
 }
 
 -(void) unregisterForEvents
 {
     [super unregisterForEvents];
-    
     [self stopNotifier];
+    
+    [self destroyTimeoutTimer];
+}
+
+-(void) timeoutTimerTick:(NSTimer*)timer
+{
+    if (![self hasBytesAvailable])
+    {
+        if ([self hasGotNetworkConnection])
+        {
+            uint64_t currentTicks = GetTickCount();
+            
+            if (((currentTicks - ticksWhenLastDataReceived) / 1000) >= options.inactivePeriodBeforeReconnectSeconds)
+            {
+                serial++;
+                
+                NSLog(@"timeoutTimerTick %lld/%lld", self.position, self.length);
+                
+                [self attemptReconnectWithSerial:@(serial)];
+            }
+        }
+    }
+}
+
+-(void) createTimeoutTimer
+{
+    [self destroyTimeoutTimer];
+    
+    NSRunLoop* runLoop = self.innerDataSource.eventsRunLoop;
+    
+    if (runLoop == nil)
+    {
+        return;
+    }
+    
+    timeoutTimer = [NSTimer timerWithTimeInterval:options.watchdogPeriodSeconds target:self selector:@selector(timeoutTimerTick:) userInfo:@(serial) repeats:YES];
+    
+    [runLoop addTimer:timeoutTimer forMode:NSRunLoopCommonModes];
+}
+
+-(void) destroyTimeoutTimer
+{
+    if (timeoutTimer)
+    {
+        [timeoutTimer invalidate];
+        timeoutTimer = nil;
+    }
 }
 
 -(void) stopNotifier
@@ -148,6 +246,19 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
     return NO;
 }
 
+-(void) seekToOffset:(int64_t)offset
+{
+	ticksWhenLastDataReceived = GetTickCount();
+	
+	[super seekToOffset:offset];
+}
+
+-(void) close
+{
+    [self destroyTimeoutTimer];
+    [super close];
+}
+
 -(void) dealloc
 {
     NSLog(@"STKAutoRecoveringHTTPDataSource dealloc");
@@ -155,6 +266,7 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
     self.innerDataSource.delegate = nil;
     
     [self stopNotifier];
+    [self destroyTimeoutTimer];
     
     [NSObject cancelPreviousPerformRequestsWithTarget:self];
     
@@ -170,15 +282,25 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
     {
         waitingForNetwork = NO;
         
+        NSLog(@"reachabilityChanged %lld/%lld", self.position, self.length);
+        
+        serial++;
+        
         [self attemptReconnectWithSerial:@(serial)];
     }
 }
 
 -(void) dataSourceDataAvailable:(STKDataSource*)dataSource
 {
+    if (![self.innerDataSource hasBytesAvailable])
+    {
+        return;
+    }
+    
     serial++;
     waitSeconds = 1;
-
+    ticksWhenLastDataReceived = GetTickCount();
+    
     [super dataSourceDataAvailable:dataSource];
 }
 
@@ -191,7 +313,10 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
     
     NSLog(@"attemptReconnect %lld/%lld", self.position, self.length);
     
-    [self seekToOffset:self.position];
+	if (self.innerDataSource.eventsRunLoop)
+	{
+		[self.innerDataSource reconnect];
+	}
 }
 
 -(void) attemptReconnectWithTimer:(NSTimer*)timer
@@ -214,10 +339,14 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
     
     if (runLoop == nil)
     {
-        [self performSelector:@selector(attemptReconnectWithSerial:) withObject:@(serial) afterDelay:waitSeconds];
+        // DataSource no longer used
+        
+        return;
     }
     else
     {
+        serial++;
+        
         NSTimer* timer = [NSTimer timerWithTimeInterval:waitSeconds target:self selector:@selector(attemptReconnectWithTimer:) userInfo:@(serial) repeats:NO];
         
         [runLoop addTimer:timer forMode:NSRunLoopCommonModes];

StreamingKit/StreamingKit/STKCoreFoundationDataSource.h

@@ -54,6 +54,7 @@
 -(BOOL) reregisterForEvents;
 
 -(void) open;
+-(void) openCompleted;
 -(void) dataAvailable;
 -(void) eof;
 -(void) errorOccured;

StreamingKit/StreamingKit/STKCoreFoundationDataSource.m

@@ -49,6 +49,9 @@ static void ReadStreamCallbackProc(CFReadStreamRef stream, CFStreamEventType eve
         case kCFStreamEventHasBytesAvailable:
             [datasource dataAvailable];
             break;
+        case kCFStreamEventOpenCompleted:
+            [datasource openCompleted];
+            break;
         default:
             break;
     }
@@ -101,6 +104,11 @@ static void ReadStreamCallbackProc(CFReadStreamRef stream, CFStreamEventType eve
 {
     if (stream)
     {
+        if (eventsRunLoop)
+        {
+            [self unregisterForEvents];
+        }
+        
         CFReadStreamClose(stream);
         CFRelease(stream);
         
@@ -112,7 +120,7 @@ static void ReadStreamCallbackProc(CFReadStreamRef stream, CFStreamEventType eve
 {
 }
 
--(void) seekToOffset:(long long)offset
+-(void) seekToOffset:(SInt64)offset
 {
 }
 
@@ -127,6 +135,8 @@ static void ReadStreamCallbackProc(CFReadStreamRef stream, CFStreamEventType eve
     {
         CFReadStreamSetClient(stream, kCFStreamEventHasBytesAvailable | kCFStreamEventErrorOccurred | kCFStreamEventEndEncountered, NULL, NULL);
         CFReadStreamUnscheduleFromRunLoop(stream, [eventsRunLoop getCFRunLoop], kCFRunLoopCommonModes);
+        
+        eventsRunLoop = nil;
     }
 }
 
@@ -148,10 +158,10 @@ static void ReadStreamCallbackProc(CFReadStreamRef stream, CFStreamEventType eve
 {
     eventsRunLoop = runLoop;
     
-    if (!stream)
+	if (!stream)
     {
-        [self open];
-        
+		// Will register when they open or seek
+		
         return YES;
     }
  
@@ -184,4 +194,8 @@ static void ReadStreamCallbackProc(CFReadStreamRef stream, CFStreamEventType eve
     return 0;
 }
 
+-(void) openCompleted
+{
+}
+
 @end

StreamingKit/StreamingKit/STKDataSource.h

@@ -43,15 +43,10 @@
 -(void) dataSourceEof:(STKDataSource*)dataSource;
 @end
 
-@protocol AudioDataSource<NSObject>
-@property (readwrite) double averageBitRate;
-@property (readwrite) long long audioDataOffset;
-@end
-
 @interface STKDataSource : NSObject
 
-@property (readonly) long long position;
-@property (readonly) long long length;
+@property (readonly) SInt64 position;
+@property (readonly) SInt64 length;
 @property (readonly) BOOL hasBytesAvailable;
 @property (readwrite, unsafe_unretained) id<STKDataSourceDelegate> delegate;
 
@@ -59,7 +54,7 @@
 -(void) unregisterForEvents;
 -(void) close;
 
--(void) seekToOffset:(long long)offset;
+-(void) seekToOffset:(SInt64)offset;
 -(int) readIntoBuffer:(UInt8*)buffer withSize:(int)size;
 -(AudioFileTypeID) audioFileTypeHint;
 

StreamingKit/StreamingKit/STKDataSource.m

@@ -37,12 +37,12 @@
 @implementation STKDataSource
 @synthesize delegate;
 
--(long long) length
+-(SInt64) length
 {
     return 0;
 }
 
--(void) seekToOffset:(long long)offset
+-(void) seekToOffset:(SInt64)offset
 {
 }
 
@@ -51,7 +51,7 @@
     return -1;
 }
 
--(long long) position
+-(SInt64) position
 {
     return 0;
 }
@@ -66,7 +66,7 @@
 }
 
 -(void) close
-{
+{    
 }
 
 -(BOOL) hasBytesAvailable

StreamingKit/StreamingKit/STKDataSourceWrapper.m

@@ -62,12 +62,12 @@
     self.innerDataSource.delegate = nil;
 }
 
--(long long) length
+-(SInt64) length
 {
     return self.innerDataSource.length;
 }
 
--(void) seekToOffset:(long long)offset
+-(void) seekToOffset:(SInt64)offset
 {
     return [self.innerDataSource seekToOffset:offset];
 }
@@ -77,7 +77,7 @@
     return [self.innerDataSource readIntoBuffer:buffer withSize:size];
 }
 
--(long long) position
+-(SInt64) position
 {
     return self.innerDataSource.position;
 }

StreamingKit/StreamingKit/STKHTTPDataSource.h

@@ -43,12 +43,13 @@ typedef void(^STKAsyncURLProvider)(STKHTTPDataSource* dataSource, BOOL forSeek,
 @interface STKHTTPDataSource : STKCoreFoundationDataSource
 
 @property (readonly, retain) NSURL* url;
-@property (readwrite) UInt32 httpStatusCode;
+@property (readonly) UInt32 httpStatusCode;
 
 +(AudioFileTypeID) audioFileTypeHintFromMimeType:(NSString*)fileExtension;
 -(id) initWithURL:(NSURL*)url;
 -(id) initWithURLProvider:(STKURLProvider)urlProvider;
 -(id) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProvider;
 -(NSRunLoop*) eventsRunLoop;
+-(void) reconnect;
 
 @end

StreamingKit/StreamingKit/STKHTTPDataSource.m

@@ -38,10 +38,13 @@
 @interface STKHTTPDataSource()
 {
 @private
-    long long seekStart;
-    long long relativePosition;
-    long long fileLength;
+    UInt32 httpStatusCode;
+    SInt64 seekStart;
+    SInt64 relativePosition;
+    SInt64 fileLength;
     int discontinuous;
+	int requestSerialNumber;
+
     NSURL* currentUrl;
     STKAsyncURLProvider asyncUrlProvider;
     NSDictionary* httpHeaders;
@@ -138,21 +141,28 @@
 
 -(void) dataAvailable
 {
+    if (stream == NULL) {
+        return;
+    }
+    
 	if (self.httpStatusCode == 0)
 	{
 		CFTypeRef response = CFReadStreamCopyProperty(stream, kCFStreamPropertyHTTPResponseHeader);
         
-        httpHeaders = (__bridge_transfer NSDictionary*)CFHTTPMessageCopyAllHeaderFields((CFHTTPMessageRef)response);
-        
-        self.httpStatusCode = CFHTTPMessageGetResponseStatusCode((CFHTTPMessageRef)response);
-        
-        CFRelease(response);
+        if (response)
+        {
+            httpHeaders = (__bridge_transfer NSDictionary*)CFHTTPMessageCopyAllHeaderFields((CFHTTPMessageRef)response);
+            
+            self->httpStatusCode = (UInt32)CFHTTPMessageGetResponseStatusCode((CFHTTPMessageRef)response);
+            
+            CFRelease(response);
+        }
 		
 		if (self.httpStatusCode == 200)
 		{
 			if (seekStart == 0)
 			{
-				fileLength = (long long)[[httpHeaders objectForKey:@"Content-Length"] integerValue];
+				fileLength = (SInt64)[[httpHeaders objectForKey:@"Content-Length"] longLongValue];
 			}
 			
 			NSString* contentType = [httpHeaders objectForKey:@"Content-Type"];
@@ -195,28 +205,34 @@
 	[super dataAvailable];
 }
 
--(long long) position
+-(SInt64) position
 {
     return seekStart + relativePosition;
 }
 
--(long long) length
+-(SInt64) length
 {
     return fileLength >= 0 ? fileLength : 0;
 }
 
--(void) seekToOffset:(long long)offset
+-(void) reconnect
 {
-    if (eventsRunLoop)
-    {
-        [self unregisterForEvents];
-    }
+    NSRunLoop* savedEventsRunLoop = eventsRunLoop;
     
-    if (stream)
-    {
-        CFReadStreamClose(stream);
-        CFRelease(stream);
-    }
+    [self close];
+    
+    eventsRunLoop = savedEventsRunLoop;
+	
+    [self seekToOffset:self.position];
+}
+
+-(void) seekToOffset:(SInt64)offset
+{
+    NSRunLoop* savedEventsRunLoop = eventsRunLoop;
+    
+    [self close];
+    
+    eventsRunLoop = savedEventsRunLoop;
 	
     NSAssert([NSRunLoop currentRunLoop] == eventsRunLoop, @"Seek called on wrong thread");
     
@@ -255,8 +271,18 @@
 
 -(void) openForSeek:(BOOL)forSeek
 {
+	int localRequestSerialNumber;
+	
+	requestSerialNumber++;
+	localRequestSerialNumber = requestSerialNumber;
+	
     asyncUrlProvider(self, forSeek, ^(NSURL* url)
     {
+		if (localRequestSerialNumber != self->requestSerialNumber)
+		{
+			return;
+		}
+		
         self->currentUrl = url;
 
         if (url == nil)
@@ -317,7 +343,7 @@
 
         [self reregisterForEvents];
         
-		self.httpStatusCode = 0;
+		self->httpStatusCode = 0;
 		
         // Open
 
@@ -325,6 +351,8 @@
         {
             CFRelease(stream);
             CFRelease(message);
+            
+            stream = 0;
 
             [self errorOccured];
 
@@ -337,6 +365,11 @@
     });
 }
 
+-(UInt32) httpStatusCode
+{
+    return self->httpStatusCode;
+}
+
 -(NSRunLoop*) eventsRunLoop
 {
     return self->eventsRunLoop;

StreamingKit/StreamingKit/STKLocalFileDataSource.m

@@ -36,8 +36,8 @@
 
 @interface STKLocalFileDataSource()
 {
-    long long position;
-    long long length;
+    SInt64 position;
+    SInt64 length;
     AudioFileTypeID audioFileTypeHint;
 }
 @property (readwrite, copy) NSString* filePath;
@@ -153,12 +153,12 @@
     CFReadStreamOpen(stream);
 }
 
--(long long) position
+-(SInt64) position
 {
     return position;
 }
 
--(long long) length
+-(SInt64) length
 {
     return length;
 }
@@ -181,7 +181,7 @@
     return retval;
 }
 
--(void) seekToOffset:(long long)offset
+-(void) seekToOffset:(SInt64)offset
 {
     CFStreamStatus status = kCFStreamStatusClosed;
     
@@ -200,6 +200,18 @@
         [self open];
     }
     
+    if (stream == 0)
+    {
+        CFRunLoopPerformBlock(eventsRunLoop.getCFRunLoop, NSRunLoopCommonModes, ^
+        {
+            [self errorOccured];
+        });
+        
+        CFRunLoopWakeUp(eventsRunLoop.getCFRunLoop);
+        
+        return;
+    }
+    
     if (CFReadStreamSetProperty(stream, kCFStreamPropertyFileCurrentOffset, (__bridge CFTypeRef)[NSNumber numberWithLongLong:offset]) != TRUE)
     {
         position = 0;

StreamingKit/StreamingKit/STKQueueEntry.h

@@ -22,9 +22,9 @@
     UInt64 audioDataByteCount;
     UInt32 packetBufferSize;
     volatile Float64 seekTime;
-    volatile int64_t framesQueued;
-    volatile int64_t framesPlayed;
-    volatile int64_t lastFrameQueued;
+    volatile SInt64 framesQueued;
+    volatile SInt64 framesPlayed;
+    volatile SInt64 lastFrameQueued;
     volatile int processedPacketsCount;
 	volatile int processedPacketsSizeTotal;
     AudioStreamBasicDescription audioStreamBasicDescription;
@@ -40,7 +40,6 @@
 -(double) duration;
 -(Float64) progressInFrames;
 -(double) calculatedBitRate;
--(void) updateAudioDataSource;
 -(BOOL) isDefinitelyCompatible:(AudioStreamBasicDescription*)basicDescription;
 
 @end

StreamingKit/StreamingKit/STKQueueEntry.m

@@ -9,7 +9,8 @@
 #import "STKQueueEntry.h"
 #import "STKDataSource.h"
 
-#define STK_BIT_RATE_ESTIMATION_MIN_PACKETS (64)
+#define STK_BIT_RATE_ESTIMATION_MIN_PACKETS_MIN (2)
+#define STK_BIT_RATE_ESTIMATION_MIN_PACKETS_PREFERRED (64)
 
 @implementation STKQueueEntry
 
@@ -17,6 +18,8 @@
 {
     if (self = [super init])
     {
+        self->spinLock = OS_SPINLOCK_INIT;
+        
         self.dataSource = dataSourceIn;
         self.queueItemId = queueItemIdIn;
         self->lastFrameQueued = -1;
@@ -38,13 +41,16 @@
 {
     double retval;
     
-    if (packetDuration && processedPacketsCount > STK_BIT_RATE_ESTIMATION_MIN_PACKETS)
+    if (packetDuration > 0)
 	{
-		double averagePacketByteSize = processedPacketsSizeTotal / processedPacketsCount;
-        
-		retval = averagePacketByteSize / packetDuration * 8;
-        
-        return retval;
+		if (processedPacketsCount > STK_BIT_RATE_ESTIMATION_MIN_PACKETS_PREFERRED || (audioStreamBasicDescription.mBytesPerFrame == 0 && processedPacketsCount > STK_BIT_RATE_ESTIMATION_MIN_PACKETS_MIN))
+		{
+			double averagePacketByteSize = processedPacketsSizeTotal / processedPacketsCount;
+			
+			retval = averagePacketByteSize / packetDuration * 8;
+			
+			return retval;
+		}
 	}
 	
     retval = (audioStreamBasicDescription.mBytesPerFrame * audioStreamBasicDescription.mSampleRate) * 8;
@@ -52,19 +58,6 @@
     return retval;
 }
 
--(void) updateAudioDataSource
-{
-    if ([self.dataSource conformsToProtocol:@protocol(AudioDataSource)])
-    {
-        double calculatedBitrate = [self calculatedBitRate];
-        
-        id<AudioDataSource> audioDataSource = (id<AudioDataSource>)self.dataSource;
-        
-        audioDataSource.averageBitRate = calculatedBitrate;
-        audioDataSource.audioDataOffset = audioDataOffset;
-    }
-}
-
 -(double) duration
 {
     if (self->sampleRate <= 0)