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

Fix album shuffle again

Browse source
This commit is contained in:
Christopher Snowhill 2019-12-15 18:12:06 -08:00
parent 61c6cf3285
commit 072c4346cf
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Playlist/PlaylistController.m
View file

@ -817,7 +817,7 @@
NSArray * wholeAlbum = [self filterPlaylistOnAlbum:currentAlbum]; NSArray * wholeAlbum = [self filterPlaylistOnAlbum:currentAlbum];
// First prune the shuffle list of the currently playing album // First prune the shuffle list of the currently playing album
int i, j; long i, j;
for (i = 0; i < [shuffleList count];) { for (i = 0; i < [shuffleList count];) {
if ([wholeAlbum containsObject:[shuffleList objectAtIndex:i]]) { if ([wholeAlbum containsObject:[shuffleList objectAtIndex:i]]) {
[shuffleList removeObjectAtIndex:i]; [shuffleList removeObjectAtIndex:i];
@ -827,28 +827,24 @@
} }
} }
// Then insert the playing album at the start, beginning with // Then insert the playing album at the start
// the current track NSIndexSet * indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [wholeAlbum count])];
BOOL found = NO;
for (i = 0, j = 0; i < [wholeAlbum count]; i++) {
if (!found && [wholeAlbum objectAtIndex:i] == currentEntry) {
found = YES;
}
if (found) {
[shuffleList insertObject:[wholeAlbum objectAtIndex:i] atIndex:j];
++j;
}
}
[shuffleList insertObjects:wholeAlbum atIndexes:indexSet];
// Oops, gotta reset the shuffle indexes
for (i = 0, j = [shuffleList count]; i < j; ++i) {
[[shuffleList objectAtIndex:i] setShuffleIndex:(int)i];
}
} }
else { else {
[shuffleList insertObject:currentEntry atIndex:0]; [shuffleList insertObject:currentEntry atIndex:0];
[currentEntry setShuffleIndex:0]; [currentEntry setShuffleIndex:0];
//Need to rejigger so the current entry is at the start now... //Need to rejigger so the current entry is at the start now...
int i; long i, j;
BOOL found = NO; BOOL found = NO;
for (i = 1; i < [shuffleList count] && !found; i++) for (i = 1, j = [shuffleList count]; i < j && !found; i++)
{ {
if ([shuffleList objectAtIndex:i] == currentEntry) if ([shuffleList objectAtIndex:i] == currentEntry)
{ {
@ -856,7 +852,7 @@
[shuffleList removeObjectAtIndex:i]; [shuffleList removeObjectAtIndex:i];
} }
else { else {
[[shuffleList objectAtIndex:i] setShuffleIndex: i]; [[shuffleList objectAtIndex:i] setShuffleIndex: (int)i];
} }
} }
} }