|
|
|
@@ -48,12 +48,6 @@
|
|
|
|
|
|
|
|
|
|
#define OSSTATUS_PARAM_ERROR (-50)
|
|
|
|
|
|
|
|
|
|
#define SPIN_LOCK_LOCK(x) \
|
|
|
|
|
while(OSAtomicCompareAndSwapInt(0, 1, x) == false);
|
|
|
|
|
|
|
|
|
|
#define SPIN_LOCK_UNLOCK(x) \
|
|
|
|
|
*x = 0;
|
|
|
|
|
|
|
|
|
|
@interface NSMutableArray(AudioPlayerExtensions)
|
|
|
|
|
-(void) enqueue:(id)obj;
|
|
|
|
|
-(id) dequeue;
|
|
|
|
@@ -219,7 +213,7 @@
|
|
|
|
|
|
|
|
|
|
double calculatedBitRate = [self calculatedBitRate];
|
|
|
|
|
|
|
|
|
|
if (calculatedBitRate == 0 || self->dataSource.length == 0)
|
|
|
|
|
if (calculatedBitRate == 0 || dataSource.length == 0)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
@@ -321,9 +315,9 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
if ([self.delegate respondsToSelector:@selector(audioPlayer:internalStateChanged:)])
|
|
|
|
|
{
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^
|
|
|
|
|
{
|
|
|
|
|
[self.delegate audioPlayer:self internalStateChanged:internalState];
|
|
|
|
|
});
|
|
|
|
|
{
|
|
|
|
|
[self.delegate audioPlayer:self internalStateChanged:internalState];
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AudioPlayerState newState;
|
|
|
|
@@ -393,7 +387,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
{
|
|
|
|
|
fastApiQueue = [[NSOperationQueue alloc] init];
|
|
|
|
|
[fastApiQueue setMaxConcurrentOperationCount:1];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
readBufferSize = readBufferSizeIn;
|
|
|
|
|
readBuffer = calloc(sizeof(UInt8), readBufferSize);
|
|
|
|
|
|
|
|
|
@@ -534,12 +528,12 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
[upcomingQueue removeAllObjects];
|
|
|
|
|
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^
|
|
|
|
|
{
|
|
|
|
|
if ([self.delegate respondsToSelector:@selector(audioPlayer:didCancelQueuedItems:)])
|
|
|
|
|
{
|
|
|
|
|
[self.delegate audioPlayer:self didCancelQueuedItems:array];
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
{
|
|
|
|
|
if ([self.delegate respondsToSelector:@selector(audioPlayer:didCancelQueuedItems:)])
|
|
|
|
|
{
|
|
|
|
|
[self.delegate audioPlayer:self didCancelQueuedItems:array];
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
}
|
|
|
|
@@ -554,34 +548,34 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
[fastApiQueue cancelAllOperations];
|
|
|
|
|
|
|
|
|
|
[fastApiQueue addOperationWithBlock:^
|
|
|
|
|
{
|
|
|
|
|
pthread_mutex_lock(&playerMutex);
|
|
|
|
|
{
|
|
|
|
|
[self startSystemBackgroundTask];
|
|
|
|
|
|
|
|
|
|
[self clearQueue];
|
|
|
|
|
|
|
|
|
|
[upcomingQueue enqueue:[[QueueEntry alloc] initWithDataSource:dataSourceIn andQueueItemId:queueItemId]];
|
|
|
|
|
|
|
|
|
|
self.internalState = AudioPlayerInternalStateRunning;
|
|
|
|
|
[self processQueue:YES];
|
|
|
|
|
}
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
}];
|
|
|
|
|
{
|
|
|
|
|
pthread_mutex_lock(&playerMutex);
|
|
|
|
|
{
|
|
|
|
|
[self startSystemBackgroundTask];
|
|
|
|
|
|
|
|
|
|
[self clearQueue];
|
|
|
|
|
|
|
|
|
|
[upcomingQueue enqueue:[[QueueEntry alloc] initWithDataSource:dataSourceIn andQueueItemId:queueItemId]];
|
|
|
|
|
|
|
|
|
|
self.internalState = AudioPlayerInternalStateRunning;
|
|
|
|
|
[self processQueue:YES];
|
|
|
|
|
}
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
}];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-(void) queueDataSource:(DataSource*)dataSourceIn withQueueItemId:(NSObject*)queueItemId
|
|
|
|
|
{
|
|
|
|
|
[fastApiQueue addOperationWithBlock:^
|
|
|
|
|
{
|
|
|
|
|
pthread_mutex_lock(&playerMutex);
|
|
|
|
|
{
|
|
|
|
|
[upcomingQueue enqueue:[[QueueEntry alloc] initWithDataSource:dataSourceIn andQueueItemId:queueItemId]];
|
|
|
|
|
|
|
|
|
|
[self processQueue:NO];
|
|
|
|
|
}
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
}];
|
|
|
|
|
{
|
|
|
|
|
pthread_mutex_lock(&playerMutex);
|
|
|
|
|
{
|
|
|
|
|
[upcomingQueue enqueue:[[QueueEntry alloc] initWithDataSource:dataSourceIn andQueueItemId:queueItemId]];
|
|
|
|
|
|
|
|
|
|
[self processQueue:NO];
|
|
|
|
|
}
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
}];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-(void) handlePropertyChangeForFileStream:(AudioFileStreamID)inAudioFileStream fileStreamPropertyID:(AudioFileStreamPropertyID)inPropertyID ioFlags:(UInt32*)ioFlags
|
|
|
|
@@ -605,12 +599,13 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
break;
|
|
|
|
|
case kAudioFileStreamProperty_DataFormat:
|
|
|
|
|
{
|
|
|
|
|
AudioStreamBasicDescription newBasicDescription;
|
|
|
|
|
UInt32 size = sizeof(newBasicDescription);
|
|
|
|
|
|
|
|
|
|
AudioFileStreamGetProperty(inAudioFileStream, kAudioFileStreamProperty_DataFormat, &size, &newBasicDescription);
|
|
|
|
|
|
|
|
|
|
currentlyReadingEntry->audioStreamBasicDescription = newBasicDescription;
|
|
|
|
|
if (currentlyReadingEntry->audioStreamBasicDescription.mSampleRate == 0) {
|
|
|
|
|
AudioStreamBasicDescription newBasicDescription;
|
|
|
|
|
UInt32 size = sizeof(newBasicDescription);
|
|
|
|
|
|
|
|
|
|
AudioFileStreamGetProperty(inAudioFileStream, kAudioFileStreamProperty_DataFormat, &size, &newBasicDescription);
|
|
|
|
|
currentlyReadingEntry->audioStreamBasicDescription = newBasicDescription;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
currentlyReadingEntry->sampleRate = currentlyReadingEntry->audioStreamBasicDescription.mSampleRate;
|
|
|
|
|
currentlyReadingEntry->packetDuration = currentlyReadingEntry->audioStreamBasicDescription.mFramesPerPacket / currentlyReadingEntry->sampleRate;
|
|
|
|
@@ -652,6 +647,44 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
discontinuous = YES;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case kAudioFileStreamProperty_FormatList:
|
|
|
|
|
{
|
|
|
|
|
Boolean outWriteable;
|
|
|
|
|
UInt32 formatListSize;
|
|
|
|
|
OSStatus err = AudioFileStreamGetPropertyInfo(inAudioFileStream, kAudioFileStreamProperty_FormatList, &formatListSize, &outWriteable);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AudioFormatListItem *formatList = malloc(formatListSize);
|
|
|
|
|
err = AudioFileStreamGetProperty(inAudioFileStream, kAudioFileStreamProperty_FormatList, &formatListSize, formatList);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
free(formatList);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i * sizeof(AudioFormatListItem) < formatListSize; i += sizeof(AudioFormatListItem))
|
|
|
|
|
{
|
|
|
|
|
AudioStreamBasicDescription pasbd = formatList[i].mASBD;
|
|
|
|
|
|
|
|
|
|
if (pasbd.mFormatID == kAudioFormatMPEG4AAC_HE ||
|
|
|
|
|
pasbd.mFormatID == kAudioFormatMPEG4AAC_HE_V2)
|
|
|
|
|
{
|
|
|
|
|
//
|
|
|
|
|
// We've found HE-AAC, remember this to tell the audio queue
|
|
|
|
|
// when we construct it.
|
|
|
|
|
//
|
|
|
|
|
#if !TARGET_IPHONE_SIMULATOR
|
|
|
|
|
currentlyReadingEntry->audioStreamBasicDescription = pasbd;
|
|
|
|
|
#endif
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
free(formatList);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -815,7 +848,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
|
|
|
|
|
if (currentlyPlayingEntry)
|
|
|
|
|
{
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
{
|
|
|
|
|
if (currentlyPlayingEntry)
|
|
|
|
|
{
|
|
|
|
@@ -827,7 +860,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int index = (int)bufferIn % audioQueueBufferRefLookupCount;
|
|
|
|
@@ -876,7 +909,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
if (!audioQueueFlushing && [self progress] > 4.0 && numberOfBuffersUsed == 0 ) {
|
|
|
|
|
self.internalState = AudioPlayerInternalStateRebuffering;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!audioQueueFlushing)
|
|
|
|
|
{
|
|
|
|
@@ -889,9 +922,9 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
if (playbackThread)
|
|
|
|
|
{
|
|
|
|
|
CFRunLoopPerformBlock([playbackThreadRunLoop getCFRunLoop], NSDefaultRunLoopMode, ^
|
|
|
|
|
{
|
|
|
|
|
[self audioQueueFinishedPlaying:entry];
|
|
|
|
|
});
|
|
|
|
|
{
|
|
|
|
|
[self audioQueueFinishedPlaying:entry];
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
CFRunLoopWakeUp([playbackThreadRunLoop getCFRunLoop]);
|
|
|
|
|
|
|
|
|
@@ -900,7 +933,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (self.internalState == AudioPlayerInternalStateStopped
|
|
|
|
|
|| self.internalState == AudioPlayerInternalStateStopping
|
|
|
|
|
|| self.internalState == AudioPlayerInternalStateDisposed
|
|
|
|
@@ -1040,7 +1073,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
|
|
|
|
|
pthread_mutex_lock(&queueBuffersMutex);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
waiting = YES;
|
|
|
|
|
|
|
|
|
|
while (bufferUsed[fillBufferIndex] && !(seekToTimeWasRequested || self.internalState == AudioPlayerInternalStateStopped || self.internalState == AudioPlayerInternalStateStopping || self.internalState == AudioPlayerInternalStateDisposed))
|
|
|
|
@@ -1080,9 +1113,9 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
audioQueue = nil;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
currentAudioStreamBasicDescription = currentlyPlayingEntry->audioStreamBasicDescription;
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
error = AudioQueueNewOutput(¤tlyPlayingEntry->audioStreamBasicDescription, AudioQueueOutputCallbackProc, (__bridge void*)self, NULL, NULL, 0, &audioQueue);
|
|
|
|
|
|
|
|
|
@@ -1187,16 +1220,22 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
QueueEntry* entry = currentlyPlayingEntry;
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
if (entry == nil)
|
|
|
|
|
{
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return [entry duration];
|
|
|
|
|
double retval = [entry duration];
|
|
|
|
|
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-(double) progress
|
|
|
|
@@ -1211,11 +1250,22 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
QueueEntry* entry = currentlyPlayingEntry;
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
return [entry progress];
|
|
|
|
|
QueueEntry* entry = currentlyPlayingEntry;
|
|
|
|
|
|
|
|
|
|
if (entry == nil)
|
|
|
|
|
{
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
double retval = [entry progress];
|
|
|
|
|
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-(void) wakeupPlaybackThread
|
|
|
|
@@ -1322,9 +1372,9 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
{
|
|
|
|
|
[currentlyReadingEntry.dataSource seekToOffset:0];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[currentlyReadingEntry.dataSource registerForEvents:[NSRunLoop currentRunLoop]];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (startPlaying)
|
|
|
|
|
{
|
|
|
|
|
[bufferingQueue removeAllObjects];
|
|
|
|
@@ -1365,9 +1415,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
double progress = [entry progress];
|
|
|
|
|
double duration = [entry duration];
|
|
|
|
|
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
BOOL nextIsDifferent = currentlyPlayingEntry != next;
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
if (next)
|
|
|
|
|
{
|
|
|
|
@@ -1378,35 +1426,33 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
seekToTimeWasRequested = NO;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
currentlyPlayingEntry = next;
|
|
|
|
|
currentlyPlayingEntry->bytesPlayed = 0;
|
|
|
|
|
NSObject* playingQueueItemId = playingQueueItemId = currentlyPlayingEntry.queueItemId;
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
if (nextIsDifferent && entry)
|
|
|
|
|
{
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^
|
|
|
|
|
{
|
|
|
|
|
[self.delegate audioPlayer:self didFinishPlayingQueueItemId:queueItemId withReason:stopReason andProgress:progress andDuration:duration];
|
|
|
|
|
});
|
|
|
|
|
{
|
|
|
|
|
[self.delegate audioPlayer:self didFinishPlayingQueueItemId:queueItemId withReason:stopReason andProgress:progress andDuration:duration];
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (nextIsDifferent)
|
|
|
|
|
{
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^
|
|
|
|
|
{
|
|
|
|
|
[self.delegate audioPlayer:self didStartPlayingQueueItemId:playingQueueItemId];
|
|
|
|
|
});
|
|
|
|
|
{
|
|
|
|
|
[self.delegate audioPlayer:self didStartPlayingQueueItemId:playingQueueItemId];
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
{
|
|
|
|
|
currentlyPlayingEntry = nil;
|
|
|
|
|
}
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
currentlyPlayingEntry = nil;
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
if (currentlyReadingEntry == nil)
|
|
|
|
|
{
|
|
|
|
@@ -1475,11 +1521,9 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
[bufferingQueue dequeue];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
{
|
|
|
|
|
currentlyPlayingEntry = nil;
|
|
|
|
|
}
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
currentlyPlayingEntry = nil;
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
currentlyReadingEntry = nil;
|
|
|
|
|
seekToTimeWasRequested = NO;
|
|
|
|
@@ -1504,11 +1548,9 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
[bufferingQueue dequeue];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
{
|
|
|
|
|
currentlyPlayingEntry = nil;
|
|
|
|
|
}
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
currentlyPlayingEntry = nil;
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
currentlyReadingEntry = nil;
|
|
|
|
|
pthread_mutex_unlock(&queueBuffersMutex);
|
|
|
|
@@ -1589,16 +1631,16 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
{
|
|
|
|
|
[bufferingQueue dequeue];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QueueEntry* newEntry = [[QueueEntry alloc] initWithDataSource:currentlyReadingEntry.dataSource andQueueItemId:currentlyReadingEntry.queueItemId];
|
|
|
|
|
|
|
|
|
|
newEntry->audioStreamBasicDescription = currentlyReadingEntry->audioStreamBasicDescription;
|
|
|
|
|
|
|
|
|
|
[upcomingQueue skipQueue:newEntry];
|
|
|
|
|
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
currentlyReadingEntry = nil;
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@@ -1619,7 +1661,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
-(void) startInternal
|
|
|
|
|
{
|
|
|
|
|
@autoreleasepool
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
playbackThreadRunLoop = [NSRunLoop currentRunLoop];
|
|
|
|
|
|
|
|
|
|
NSThread.currentThread.threadPriority = 1;
|
|
|
|
@@ -1628,14 +1670,14 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
packetsFilled = 0;
|
|
|
|
|
|
|
|
|
|
[playbackThreadRunLoop addPort:[NSPort port] forMode:NSDefaultRunLoopMode];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
|
|
|
|
if (![self processRunloop])
|
|
|
|
|
{
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
NSDate *date = [[NSDate alloc] initWithTimeIntervalSinceNow:10];
|
|
|
|
|
[playbackThreadRunLoop runMode:NSDefaultRunLoopMode beforeDate:date];
|
|
|
|
|
}
|
|
|
|
@@ -1648,11 +1690,11 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
|
|
|
|
|
currentlyReadingEntry = nil;
|
|
|
|
|
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
{
|
|
|
|
|
currentlyPlayingEntry = nil;
|
|
|
|
|
}
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
pthread_mutex_lock(&playerMutex);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
currentlyPlayingEntry = nil;
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
|
|
|
|
|
self.internalState = AudioPlayerInternalStateDisposed;
|
|
|
|
|
|
|
|
|
@@ -1664,9 +1706,9 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
-(void) processSeekToTime
|
|
|
|
|
{
|
|
|
|
|
OSStatus error;
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
QueueEntry* currentEntry = currentlyReadingEntry;
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
NSAssert(currentEntry == currentlyPlayingEntry, @"playing and reading must be the same");
|
|
|
|
|
|
|
|
|
@@ -1817,14 +1859,14 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
if (error)
|
|
|
|
|
{
|
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^
|
|
|
|
|
{
|
|
|
|
|
[self didEncounterError:AudioPlayerErrorQueueStopFailed];;
|
|
|
|
|
});
|
|
|
|
|
{
|
|
|
|
|
[self didEncounterError:AudioPlayerErrorQueueStopFailed];;
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pthread_mutex_lock(&queueBuffersMutex);
|
|
|
|
|
|
|
|
|
|
if (numberOfBuffersUsed != 0)
|
|
|
|
@@ -2031,7 +2073,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
[self wakeupPlaybackThread];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
pthread_mutex_unlock(&playerMutex);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-(void) stop
|
|
|
|
@@ -2104,16 +2146,22 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
|
|
|
|
|
|
|
|
|
|
-(NSObject*) currentlyPlayingQueueItemId
|
|
|
|
|
{
|
|
|
|
|
SPIN_LOCK_LOCK(¤tlyPlayingLock);
|
|
|
|
|
OSSpinLockLock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
QueueEntry* entry = currentlyPlayingEntry;
|
|
|
|
|
SPIN_LOCK_UNLOCK(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
if (entry == nil)
|
|
|
|
|
{
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
return nil;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return entry.queueItemId;
|
|
|
|
|
NSObject* retval = entry.queueItemId;
|
|
|
|
|
|
|
|
|
|
OSSpinLockUnlock(¤tlyPlayingLock);
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@end
|
|
|
|
|