kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Playlist Loader] Revert background loader 

This reverts most of 802a86a3d8, since it
didn't work anyway.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
xcode15
Christopher Snowhill 2022-07-04 18:08:45 -07:00
parent 92bce537d1
commit 511f1a1937
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Playlist/PlaylistLoader.h
View File

@ -32,9 +32,6 @@ typedef enum {
BOOL metadataLoadInProgress; BOOL metadataLoadInProgress;
NSMutableDictionary *queuedURLs; NSMutableDictionary *queuedURLs;
dispatch_queue_t loaderQueue;
atomic_int loaderQueueRefCount;
} }
- (void)initDefaults; - (void)initDefaults;

32
Playlist/PlaylistLoader.m
View File

@ -56,9 +56,6 @@ extern NSMutableDictionary<NSString *, AlbumArtwork *> *kArtworkDictionary;
[queue setMaxConcurrentOperationCount:8]; [queue setMaxConcurrentOperationCount:8];
queuedURLs = [[NSMutableDictionary alloc] init]; queuedURLs = [[NSMutableDictionary alloc] init];
loaderQueue = dispatch_queue_create("Playlist loader queue", DISPATCH_QUEUE_SERIAL);
atomic_init(&loaderQueueRefCount, 0);
} }
return self; return self;
@ -335,35 +332,6 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
} }
- (NSArray *)insertURLs:(NSArray *)urls atIndex:(NSInteger)index sort:(BOOL)sort { - (NSArray *)insertURLs:(NSArray *)urls atIndex:(NSInteger)index sort:(BOOL)sort {
int refCount;
do {
refCount = atomic_load_explicit(&loaderQueueRefCount, memory_order_relaxed);
if(refCount > 0) {
[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.5]];
}
} while(refCount > 0);
__block NSArray *outurls = nil;
atomic_fetch_add(&self->loaderQueueRefCount, 1);
dispatch_async(loaderQueue, ^{
outurls = [self doInsertURLs:urls atIndex:index sort:sort];
atomic_fetch_sub(&self->loaderQueueRefCount, 1);
});
do {
refCount = atomic_load_explicit(&loaderQueueRefCount, memory_order_relaxed);
if(refCount > 0) {
[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.5]];
}
} while(refCount > 0);
return outurls;
}
- (NSArray *)doInsertURLs:(NSArray *)urls atIndex:(NSInteger)index sort:(BOOL)sort {
NSMutableSet *uniqueURLs = [NSMutableSet set]; NSMutableSet *uniqueURLs = [NSMutableSet set];
NSMutableArray *expandedURLs = [NSMutableArray array]; NSMutableArray *expandedURLs = [NSMutableArray array];