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

Fix playlist info loading threading magic.

CQTexperiment
Christopher Snowhill 2018-02-18 20:19:18 -08:00
parent 56ed9c3429
commit 8591c29eb8
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Playlist/PlaylistLoader.m
View File

@ -464,7 +464,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
{ {
long batchCount = ([entries count] / 16) + ([entries count] % 16 ? 1 : 0); long batchCount = ([entries count] / 16) + ([entries count] % 16 ? 1 : 0);
NSMutableArray *array = [[NSMutableArray alloc] init]; NSMutableArray *array = [[NSMutableArray alloc] init];
long i; long i, j;
for (i = 0; i < batchCount; ++i) for (i = 0; i < batchCount; ++i)
{ {
@ -482,10 +482,11 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
if (!i) return; if (!i) return;
semaphore_t info_sem; NSLock *outLock = [[NSLock alloc] init];
semaphore_create( mach_task_self(), &info_sem, SYNC_POLICY_FIFO, (int) -i + 1 ); NSMutableArray *outArray = [[NSMutableArray alloc] init];
__block semaphore_t weak_sem = info_sem; __block NSLock *weakLock = outLock;
__block NSMutableArray *weakArray = outArray;
for (NSArray *a in array) for (NSArray *a in array)
{ {
@ -497,8 +498,7 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
[op addExecutionBlock:^{ [op addExecutionBlock:^{
for (PlaylistEntry *pe in weakA) for (PlaylistEntry *pe in weakA)
{ {
__block PlaylistEntry *weakPe = pe; NSMutableDictionary *entryInfo = [NSMutableDictionary dictionaryWithCapacity:20];
__block NSMutableDictionary *entryInfo = [NSMutableDictionary dictionaryWithCapacity:20];
NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:pe.URL]; NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:pe.URL];
if (entryProperties == nil) if (entryProperties == nil)
@ -507,10 +507,10 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
[entryInfo addEntriesFromDictionary:entryProperties]; [entryInfo addEntriesFromDictionary:entryProperties];
[entryInfo addEntriesFromDictionary:[AudioMetadataReader metadataForURL:pe.URL]]; [entryInfo addEntriesFromDictionary:[AudioMetadataReader metadataForURL:pe.URL]];
dispatch_async(dispatch_get_main_queue(), ^{ [weakLock lock];
[weakPe setMetadata:entryInfo]; [weakArray addObject:pe];
semaphore_signal(weak_sem); [weakArray addObject:entryInfo];
}); [weakLock unlock];
} }
}]; }];
@ -519,6 +519,20 @@ NSMutableDictionary * dictionaryWithPropertiesOfObject(id obj, NSArray * filterL
[queue waitUntilAllOperationsAreFinished]; [queue waitUntilAllOperationsAreFinished];
semaphore_t info_sem;
semaphore_create( mach_task_self(), &info_sem, SYNC_POLICY_FIFO, (int) -i + 1 );
__block semaphore_t weak_sem = info_sem;
for (i = 0, j = [outArray count]; i < j; i += 2) {
__block PlaylistEntry *weakPe = [outArray objectAtIndex:i];
__block NSDictionary *entryInfo = [outArray objectAtIndex:i + 1];
dispatch_async(dispatch_get_main_queue(), ^{
[weakPe setMetadata:entryInfo];
semaphore_signal(weak_sem);
});
}
semaphore_wait(info_sem); semaphore_wait(info_sem);
semaphore_destroy(mach_task_self(), info_sem); semaphore_destroy(mach_task_self(), info_sem);