From bbf87829ec184e99ea01aae9626cb45acb26e8ae Mon Sep 17 00:00:00 2001 From: Pavel Lukandiy Date: Mon, 22 May 2017 16:24:39 +0300 Subject: [PATCH] Revert "Refactor" This reverts commit 4525951e5c4207e2b2296736c3165c29b27cc05b. --- StreamingKit/StreamingKit/STKAudioPlayer.h | 5 +---- StreamingKit/StreamingKit/STKAudioPlayer.m | 14 +++----------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.h b/StreamingKit/StreamingKit/STKAudioPlayer.h index 792ba6e..e864059 100644 --- a/StreamingKit/StreamingKit/STKAudioPlayer.h +++ b/StreamingKit/StreamingKit/STKAudioPlayer.h @@ -239,12 +239,9 @@ typedef void(^STKFrameFilter)(UInt32 channelsPerFrame, UInt32 bytesPerFrame, UIn /// Disposes the STKAudioPlayer and frees up all resources before returning -(void) dispose; -/// Sets playback speed +// -(void)setPlaybackSpeed:(double)speed; -/// Sets playback speed to 1.0 --(void)setDefaultPlaybackSpeed; - /// The QueueItemId of the currently playing item -(NSObject*) currentlyPlayingQueueItemId; diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m index ae115dd..61508f7 100755 --- a/StreamingKit/StreamingKit/STKAudioPlayer.m +++ b/StreamingKit/StreamingKit/STKAudioPlayer.m @@ -343,8 +343,7 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn .componentManufacturer = kAudioUnitManufacturer_Apple }; - playbackSpeedUnitDescription = (AudioComponentDescription) - { + playbackSpeedUnitDescription = (AudioComponentDescription) { .componentType = kAudioUnitType_FormatConverter, .componentSubType = kAudioUnitSubType_AUiPodTimeOther, .componentFlags = 0, @@ -1878,16 +1877,10 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn [self stopThread]; } --(void)setPlaybackSpeed:(double)speed -{ +- (void)setPlaybackSpeed:(double)speed { AudioUnitSetParameter(playbackSpeedUnit, kNewTimePitchParam_Rate, kAudioUnitScope_Global, 0, speed, 0); } --(void)setDefaultPlaybackSpeed -{ - [self setPlaybackSpeed:1.f]; -} - -(NSObject*) currentlyPlayingQueueItemId { OSSpinLockLock(¤tEntryReferencesLock); @@ -2148,8 +2141,7 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl CHECK_STATUS_AND_RETURN(AudioUnitSetProperty(outputUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kOutputBus, &canonicalAudioStreamBasicDescription, sizeof(canonicalAudioStreamBasicDescription))); } --(void) createPlaybackSpeedUnit -{ +- (void)createPlaybackSpeedUnit { OSStatus status; CHECK_STATUS_AND_RETURN(AUGraphAddNode(audioGraph, &playbackSpeedUnitDescription, &playbackSpeedNode));