From aa441045aa5935a0f9fdc72779a90439cdef33ed Mon Sep 17 00:00:00 2001 From: Thong Nguyen Date: Thu, 13 Feb 2014 17:54:24 +0000 Subject: [PATCH] Fixed pendingQueue and mostRecentlyQueuedStillPendingItem returning STKQueueEntry instead of queueItemId --- StreamingKit/StreamingKit/STKAudioPlayer.m | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m index 8c6d66f..2f26bf4 100644 --- a/StreamingKit/StreamingKit/STKAudioPlayer.m +++ b/StreamingKit/StreamingKit/STKAudioPlayer.m @@ -2728,9 +2728,16 @@ static OSStatus OutputRenderCallback(void* inRefCon, AudioUnitRenderActionFlags* NSArray* retval; NSMutableArray* mutableArray = [[NSMutableArray alloc] initWithCapacity:upcomingQueue.count + bufferingQueue.count]; - [mutableArray skipQueueWithQueue:upcomingQueue]; - [mutableArray skipQueueWithQueue:bufferingQueue]; - + for (STKQueueEntry* entry in upcomingQueue) + { + [mutableArray addObject:[entry queueItemId]]; + } + + for (STKQueueEntry* entry in bufferingQueue) + { + [mutableArray addObject:[entry queueItemId]]; + } + retval = [NSArray arrayWithArray:mutableArray]; pthread_mutex_unlock(&playerMutex); @@ -2755,7 +2762,7 @@ static OSStatus OutputRenderCallback(void* inRefCon, AudioUnitRenderActionFlags* if (upcomingQueue.count > 0) { - NSObject* retval = [upcomingQueue objectAtIndex:0]; + NSObject* retval = [[upcomingQueue objectAtIndex:0] queueItemId]; pthread_mutex_unlock(&playerMutex); @@ -2764,7 +2771,7 @@ static OSStatus OutputRenderCallback(void* inRefCon, AudioUnitRenderActionFlags* if (bufferingQueue.count > 0) { - NSObject* retval = [bufferingQueue objectAtIndex:0]; + NSObject* retval = [[bufferingQueue objectAtIndex:0] queueItemId]; pthread_mutex_unlock(&playerMutex);