diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.h b/StreamingKit/StreamingKit/STKAudioPlayer.h index e864059..0ce6d53 100644 --- a/StreamingKit/StreamingKit/STKAudioPlayer.h +++ b/StreamingKit/StreamingKit/STKAudioPlayer.h @@ -239,9 +239,6 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn /// Disposes the STKAudioPlayer and frees up all resources before returning -(void) dispose; -// --(void)setPlaybackSpeed:(double)speed; - /// The QueueItemId of the currently playing item -(NSObject*) currentlyPlayingQueueItemId; diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m index 61508f7..c97ec36 100755 --- a/StreamingKit/StreamingKit/STKAudioPlayer.m +++ b/StreamingKit/StreamingKit/STKAudioPlayer.m @@ -174,7 +174,6 @@ static UInt32 maxFramesPerSlice = 4096; static AudioComponentDescription mixerDescription; static AudioComponentDescription nbandUnitDescription; static AudioComponentDescription outputUnitDescription; -static AudioComponentDescription playbackSpeedUnitDescription; static AudioComponentDescription convertUnitDescription; static AudioStreamBasicDescription canonicalAudioStreamBasicDescription; static AudioStreamBasicDescription recordAudioStreamBasicDescription; @@ -202,7 +201,6 @@ static AudioStreamBasicDescription recordAudioStreamBasicDescription; AUNode eqNode; AUNode mixerNode; AUNode outputNode; - AUNode playbackSpeedNode; AUNode eqInputNode; AUNode eqOutputNode; @@ -212,7 +210,6 @@ static AudioStreamBasicDescription recordAudioStreamBasicDescription; AudioComponentInstance eqUnit; AudioComponentInstance mixerUnit; AudioComponentInstance outputUnit; - AudioComponentInstance playbackSpeedUnit; UInt32 eqBandCount; int32_t waitingForDataAfterSeekFrameCount; @@ -342,14 +339,6 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn .componentFlagsMask = 0, .componentManufacturer = kAudioUnitManufacturer_Apple }; - - playbackSpeedUnitDescription = (AudioComponentDescription) { - .componentType = kAudioUnitType_FormatConverter, - .componentSubType = kAudioUnitSubType_AUiPodTimeOther, - .componentFlags = 0, - .componentFlagsMask = 0, - .componentManufacturer = kAudioUnitManufacturer_Apple - }; mixerDescription = (AudioComponentDescription) { @@ -1877,10 +1866,6 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn [self stopThread]; } -- (void)setPlaybackSpeed:(double)speed { - AudioUnitSetParameter(playbackSpeedUnit, kNewTimePitchParam_Rate, kAudioUnitScope_Global, 0, speed, 0); -} - -(NSObject*) currentlyPlayingQueueItemId { OSSpinLockLock(¤tEntryReferencesLock); @@ -2141,20 +2126,6 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl CHECK_STATUS_AND_RETURN(AudioUnitSetProperty(outputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kOutputBus, &canonicalAudioStreamBasicDescription, sizeof(canonicalAudioStreamBasicDescription))); } -- (void)createPlaybackSpeedUnit { - OSStatus status; - - CHECK_STATUS_AND_RETURN(AUGraphAddNode(audioGraph, &playbackSpeedUnitDescription, &playbackSpeedNode)); - CHECK_STATUS_AND_RETURN(AUGraphNodeInfo(audioGraph, playbackSpeedNode, &playbackSpeedUnitDescription, &playbackSpeedUnit)); - - CHECK_STATUS_AND_RETURN(AudioUnitSetProperty(playbackSpeedUnit, kAudioUnitProperty_MaximumFramesPerSlice, kAudioUnitScope_Global, kOutputBus, &maxFramesPerSlice, sizeof(maxFramesPerSlice))); -#if TARGET_OS_IPHONE - CHECK_STATUS_AND_RETURN(AudioUnitSetParameter(playbackSpeedUnit, kNewTimePitchParam_Rate, kAudioUnitScope_Global, 0, 1, 0)); -#endif - - CHECK_STATUS_AND_RETURN(AudioUnitSetProperty(playbackSpeedUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kOutputBus, &canonicalAudioStreamBasicDescription, sizeof(canonicalAudioStreamBasicDescription))); -} - -(void) createMixerUnit { OSStatus status; @@ -2313,7 +2284,6 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl [self createEqUnit]; [self createMixerUnit]; - [self createPlaybackSpeedUnit]; [self createOutputUnit]; [self connectGraph]; @@ -2362,12 +2332,6 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl [nodes addObject:@(mixerNode)]; [units addObject:[NSValue valueWithPointer:mixerUnit]]; } - - if (playbackSpeedNode) - { - [nodes addObject:@(playbackSpeedNode)]; - [units addObject:[NSValue valueWithPointer:playbackSpeedUnit]]; - } if (outputNode) {