Compare commits
No commits in common. "feature/playback_speed" and "master" have entirely different histories.
feature/pl
...
master
|
|
@ -247,12 +247,6 @@ 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;
|
||||
|
||||
|
|
|
|||
|
|
@ -203,7 +203,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;
|
||||
|
|
@ -231,7 +230,6 @@ static AudioStreamBasicDescription recordAudioStreamBasicDescription;
|
|||
AUNode eqNode;
|
||||
AUNode mixerNode;
|
||||
AUNode outputNode;
|
||||
AUNode playbackSpeedNode;
|
||||
|
||||
AUNode eqInputNode;
|
||||
AUNode eqOutputNode;
|
||||
|
|
@ -241,7 +239,6 @@ static AudioStreamBasicDescription recordAudioStreamBasicDescription;
|
|||
AudioComponentInstance eqUnit;
|
||||
AudioComponentInstance mixerUnit;
|
||||
AudioComponentInstance outputUnit;
|
||||
AudioComponentInstance playbackSpeedUnit;
|
||||
|
||||
UInt32 eqBandCount;
|
||||
int32_t waitingForDataAfterSeekFrameCount;
|
||||
|
|
@ -374,15 +371,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)
|
||||
{
|
||||
|
|
@ -1925,16 +1913,6 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
|
|||
[self stopThread];
|
||||
}
|
||||
|
||||
-(void)setPlaybackSpeed:(double)speed
|
||||
{
|
||||
AudioUnitSetParameter(playbackSpeedUnit, kNewTimePitchParam_Rate, kAudioUnitScope_Global, 0, speed, 0);
|
||||
}
|
||||
|
||||
-(void)setDefaultPlaybackSpeed
|
||||
{
|
||||
[self setPlaybackSpeed:1.f];
|
||||
}
|
||||
|
||||
-(NSObject*) currentlyPlayingQueueItemId
|
||||
{
|
||||
OSSpinLockLock(¤tEntryReferencesLock);
|
||||
|
|
@ -2193,21 +2171,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;
|
||||
|
|
@ -2366,7 +2329,6 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
|
|||
|
||||
[self createEqUnit];
|
||||
[self createMixerUnit];
|
||||
[self createPlaybackSpeedUnit];
|
||||
[self createOutputUnit];
|
||||
|
||||
[self connectGraph];
|
||||
|
|
@ -2415,12 +2377,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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue