moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-04-23 08:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:moonlight-stream/moonlight-ios

Browse Source
This commit is contained in:
Diego Waxemberg
2015-11-14 12:33:44 -08:00
parent e3ffb66ef0 5daa82b0ba
commit c1e6aeb43c
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Limelight/Database/Host.h
View File

@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic) PairState pairState; @property (nonatomic) PairState pairState;
@property (nonatomic) NSString * activeAddress; @property (nonatomic) NSString * activeAddress;
- (NSComparisonResult)compareName:(Host *)other;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

4
Limelight/Database/Host.m
View File

@@ -14,4 +14,8 @@
@synthesize online; @synthesize online;
@synthesize activeAddress; @synthesize activeAddress;
- (NSComparisonResult)compareName:(Host *)other {
return [self.name caseInsensitiveCompare:other.name];
}
@end @end

30
Limelight/ViewControllers/MainFrameViewController.m
View File

@@ -640,7 +640,9 @@ static NSMutableSet* hostList;
UIComputerView* compView; UIComputerView* compView;
float prevEdge = -1; float prevEdge = -1;
@synchronized (hostList) { @synchronized (hostList) {
for (Host* comp in hostList) { // Sort the host list in alphabetical order
NSArray* sortedHostList = [[hostList allObjects] sortedArrayUsingSelector:@selector(compareName:)];
for (Host* comp in sortedHostList) {
compView = [[UIComputerView alloc] initWithComputer:comp andCallback:self]; compView = [[UIComputerView alloc] initWithComputer:comp andCallback:self];
compView.center = CGPointMake([self getCompViewX:compView addComp:addComp prevEdge:prevEdge], hostScrollView.frame.size.height / 2); compView.center = CGPointMake([self getCompViewX:compView addComp:addComp prevEdge:prevEdge], hostScrollView.frame.size.height / 2);
prevEdge = compView.frame.origin.x + compView.frame.size.width; prevEdge = compView.frame.origin.x + compView.frame.size.width;
@@ -696,13 +698,31 @@ static NSMutableSet* hostList;
_sortedAppList = [host.appList allObjects]; _sortedAppList = [host.appList allObjects];
_sortedAppList = [_sortedAppList sortedArrayUsingSelector:@selector(compareName:)]; _sortedAppList = [_sortedAppList sortedArrayUsingSelector:@selector(compareName:)];
// Start populating the box art cache asynchronously // Split the sorted array in half to allow 2 jobs to process app assets at once
NSArray *firstHalf;
NSArray *secondHalf;
NSRange range;
range.location = 0;
range.length = [_sortedAppList count] / 2;
firstHalf = [_sortedAppList subarrayWithRange:range];
range.location = range.length;
range.length = [_sortedAppList count] - range.length;
secondHalf = [_sortedAppList subarrayWithRange:range];
// Start 2 jobs
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
Log(LOG_I, @"Starting per-computer box art caching job"); for (App* app in firstHalf) {
for (App* app in host.appList) { [self updateBoxArtCacheForApp:app];
}
});
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
for (App* app in secondHalf) {
[self updateBoxArtCacheForApp:app]; [self updateBoxArtCacheForApp:app];
} }
Log(LOG_I, @"Per-computer box art caching job completed");
}); });
[hostScrollView removeFromSuperview]; [hostScrollView removeFromSuperview];