chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Repeat None correctly this time

Browse source
This commit is contained in:
Chris Moeller 2015-02-10 21:42:36 -08:00
parent 1f0f4a75a0
commit b50ed67591
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Application/PlaybackController.m
View file

@ -478,12 +478,15 @@ NSDictionary * makeRGInfo(PlaylistEntry *pe)
else else
{ {
pe = [playlistController getNextEntry:curEntry]; pe = [playlistController getNextEntry:curEntry];
if ([pe metadataLoaded] != YES) { if (pe && [pe metadataLoaded] != YES) {
[pe performSelectorOnMainThread:@selector(setMetadata:) withObject:[playlistLoader readEntryInfo:pe] waitUntilDone:YES]; [pe performSelectorOnMainThread:@selector(setMetadata:) withObject:[playlistLoader readEntryInfo:pe] waitUntilDone:YES];
} }
} }
[player setNextStream:[pe URL] withUserInfo:pe withRGInfo:makeRGInfo(pe)]; if (pe)
[player setNextStream:[pe URL] withUserInfo:pe withRGInfo:makeRGInfo(pe)];
else
[player setNextStream:nil];
} }
- (void)audioPlayer:(AudioPlayer *)player didBeginStream:(id)userInfo - (void)audioPlayer:(AudioPlayer *)player didBeginStream:(id)userInfo

4
Audio/AudioPlayer.m
View file

@ -267,6 +267,10 @@
[nextStreamRGInfo retain]; [nextStreamRGInfo retain];
[self requestNextStream: nextStreamUserInfo]; [self requestNextStream: nextStreamUserInfo];
if (!nextStream)
return YES;
newChain = [[BufferChain alloc] initWithController:self]; newChain = [[BufferChain alloc] initWithController:self];
endOfInputReached = YES; endOfInputReached = YES;