From aaaed1f33f9d456eb5dbe96535cb3b7af2a750bd Mon Sep 17 00:00:00 2001 From: Thong Nguyen Date: Wed, 22 Jan 2014 10:24:33 +0000 Subject: [PATCH] Added arm64 build back into StreamingKit. Moved private stuff out of STKAudioPlayer header files --- .../StreamingKit.xcodeproj/project.pbxproj | 4 ++-- StreamingKit/StreamingKit/STKAudioPlayer.h | 14 +++----------- StreamingKit/StreamingKit/STKAudioPlayer.m | 7 +++++++ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/StreamingKit/StreamingKit.xcodeproj/project.pbxproj b/StreamingKit/StreamingKit.xcodeproj/project.pbxproj index 39c6c85..0d65159 100644 --- a/StreamingKit/StreamingKit.xcodeproj/project.pbxproj +++ b/StreamingKit/StreamingKit.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ A1E7C4EC188D57F60010896F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; DSTROOT = /tmp/StreamingKit.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -383,7 +383,7 @@ A1E7C4ED188D57F60010896F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; DSTROOT = /tmp/StreamingKit.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.h b/StreamingKit/StreamingKit/STKAudioPlayer.h index c380fd0..deba630 100644 --- a/StreamingKit/StreamingKit/STKAudioPlayer.h +++ b/StreamingKit/StreamingKit/STKAudioPlayer.h @@ -99,10 +99,10 @@ typedef enum } AudioPlayerErrorCode; -@class STKDataSource; @class STKAudioPlayer; @protocol STKAudioPlayerDelegate + -(void) audioPlayer:(STKAudioPlayer*)audioPlayer stateChanged:(AudioPlayerState)state; -(void) audioPlayer:(STKAudioPlayer*)audioPlayer didEncounterError:(AudioPlayerErrorCode)errorCode; -(void) audioPlayer:(STKAudioPlayer*)audioPlayer didStartPlayingQueueItemId:(NSObject*)queueItemId; @@ -111,18 +111,10 @@ AudioPlayerErrorCode; @optional -(void) audioPlayer:(STKAudioPlayer*)audioPlayer logInfo:(NSString*)line; -(void) audioPlayer:(STKAudioPlayer*)audioPlayer internalStateChanged:(AudioPlayerInternalState)state; --(void) audioPlayer: (STKAudioPlayer*)audioPlayer didCancelQueuedItems:(NSArray*)queuedItems; +-(void) audioPlayer:(STKAudioPlayer*)audioPlayer didCancelQueuedItems:(NSArray*)queuedItems; + @end -@class STKQueueEntry; - -typedef struct -{ - AudioQueueBufferRef ref; - int bufferIndex; -} -AudioQueueBufferRefLookupEntry; - @interface STKAudioPlayer : NSObject @property (readonly) double duration; diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m index fa735f0..5a27edb 100644 --- a/StreamingKit/StreamingKit/STKAudioPlayer.m +++ b/StreamingKit/StreamingKit/STKAudioPlayer.m @@ -48,6 +48,13 @@ #define OSSTATUS_PARAM_ERROR (-50) +typedef struct +{ + AudioQueueBufferRef ref; + int bufferIndex; +} +AudioQueueBufferRefLookupEntry; + @interface NSMutableArray(AudioPlayerExtensions) -(void) enqueue:(id)obj; -(id) dequeue;