TouchInstinct
/
StreamingKit
310
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed test code and fixed an issue with not properly checking if the current queue should be stopped cause it's the last in the queue

This commit is contained in:
Thong Nguyen 2014-01-22 19:43:36 +00:00
parent dde738dffd
commit 1c9bd328e7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ExampleApp/ExampleApp/AppDelegate.m
View File

@ -47,8 +47,7 @@
-(void) audioPlayerViewPlayFromHTTPSelected:(AudioPlayerView*)audioPlayerView
{
// NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
NSURL* url = [NSURL URLWithString:@"file:///Users/tum/testaudio.aac"];
NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
STKAutoRecoveringHttpDataSource* dataSource = [[STKAutoRecoveringHttpDataSource alloc] initWithHttpDataSource:(STKHttpDataSource*)[audioPlayer dataSourceFromURL:url]];
@ -57,8 +56,7 @@
-(void) audioPlayerViewQueueFromHTTPSelected:(AudioPlayerView*)audioPlayerView
{
// NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
NSURL* url = [NSURL URLWithString:@"file:///Users/tum/testaudio.aac"];
NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
STKAutoRecoveringHttpDataSource* dataSource = [[STKAutoRecoveringHttpDataSource alloc] initWithHttpDataSource:(STKHttpDataSource*)[audioPlayer dataSourceFromURL:url]];

4
ExampleApp/ExampleApp/AudioPlayerView.m
View File

@ -223,9 +223,9 @@
SampleQueueId* queueId = (SampleQueueId*)queueItemId;
// NSLog(@"Requeuing: %@", [queueId.url description]);
NSLog(@"Requeuing: %@", [queueId.url description]);
// [self->audioPlayer queueDataSource:[self->audioPlayer dataSourceFromURL:queueId.url] withQueueItemId:[[SampleQueueId alloc] initWithUrl:queueId.url andCount:queueId.count + 1]];
[self->audioPlayer queueDataSource:[self->audioPlayer dataSourceFromURL:queueId.url] withQueueItemId:[[SampleQueueId alloc] initWithUrl:queueId.url andCount:queueId.count + 1]];
}
-(void) audioPlayer:(STKAudioPlayer*)audioPlayer didFinishPlayingQueueItemId:(NSObject*)queueItemId withReason:(AudioPlayerStopReason)stopReason andProgress:(double)progress andDuration:(double)duration

2
StreamingKit/StreamingKit/STKAudioPlayer.m
View File

@ -2249,6 +2249,8 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
[self.delegate audioPlayer:self didFinishBufferingSourceWithQueueItemId:queueItemId];
});
[fastApiQueue waitUntilAllOperationsAreFinished];
pthread_mutex_lock(&playerMutex);
{
BOOL stopping = NO;