moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-06-15 21:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

hostList is now thread-safe

Browse Source
This commit is contained in:
Diego Waxemberg
2015-01-01 23:54:54 -05:00
parent f209670c1a
commit a52b20ee52
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Limelight/ViewControllers/MainFrameViewController.m
+12 -1
View File
@@ -122,7 +122,9 @@ static StreamConfiguration* streamConfig;
}); });
}]]; }]];
[longClickAlert addAction:[UIAlertAction actionWithTitle:@"Remove Host" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action) { [longClickAlert addAction:[UIAlertAction actionWithTitle:@"Remove Host" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action) {
@synchronized(hostList) {
[hostList removeObject:host]; [hostList removeObject:host];
}
[_discMan removeHostFromDiscovery:host]; [_discMan removeHostFromDiscovery:host];
DataManager* dataMan = [[DataManager alloc] init]; DataManager* dataMan = [[DataManager alloc] init];
[dataMan removeHost:host]; [dataMan removeHost:host];
@@ -145,7 +147,9 @@ static StreamConfiguration* streamConfig;
DataManager* dataMan = [[DataManager alloc] init]; DataManager* dataMan = [[DataManager alloc] init];
[dataMan saveHosts]; [dataMan saveHosts];
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
@synchronized(hostList) {
[hostList addObject:host]; [hostList addObject:host];
}
[self updateHosts]; [self updateHosts];
}); });
} else { } else {
@@ -299,7 +303,9 @@ static StreamConfiguration* streamConfig;
[super viewDidDisappear:animated]; [super viewDidDisappear:animated];
// when discovery stops, we must create a new instance because you cannot restart an NSOperation when it is finished // when discovery stops, we must create a new instance because you cannot restart an NSOperation when it is finished
[_discMan stopDiscovery]; [_discMan stopDiscovery];
@synchronized(hostList) {
_discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self]; _discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self];
}
// In case the host objects were updated in the background // In case the host objects were updated in the background
[[[DataManager alloc] init] saveHosts]; [[[DataManager alloc] init] saveHosts];
} }
@@ -307,7 +313,9 @@ static StreamConfiguration* streamConfig;
- (void) retrieveSavedHosts { - (void) retrieveSavedHosts {
DataManager* dataMan = [[DataManager alloc] init]; DataManager* dataMan = [[DataManager alloc] init];
NSArray* hosts = [dataMan retrieveHosts]; NSArray* hosts = [dataMan retrieveHosts];
@synchronized(hostList) {
[hostList addObjectsFromArray:hosts]; [hostList addObjectsFromArray:hosts];
}
} }
- (void) updateAllHosts:(NSArray *)hosts { - (void) updateAllHosts:(NSArray *)hosts {
@@ -316,8 +324,10 @@ static StreamConfiguration* streamConfig;
for (Host* host in hosts) { for (Host* host in hosts) {
NSLog(@"Host: \n{\n\t name:%@ \n\t address:%@ \n\t localAddress:%@ \n\t externalAddress:%@ \n\t uuid:%@ \n\t mac:%@ \n\t pairState:%d \n\t online:%d \n}", host.name, host.address, host.localAddress, host.externalAddress, host.uuid, host.mac, host.pairState, host.online); NSLog(@"Host: \n{\n\t name:%@ \n\t address:%@ \n\t localAddress:%@ \n\t externalAddress:%@ \n\t uuid:%@ \n\t mac:%@ \n\t pairState:%d \n\t online:%d \n}", host.name, host.address, host.localAddress, host.externalAddress, host.uuid, host.mac, host.pairState, host.online);
} }
@synchronized(hostList) {
[hostList removeAllObjects]; [hostList removeAllObjects];
[hostList addObjectsFromArray:hosts]; [hostList addObjectsFromArray:hosts];
}
[self updateHosts]; [self updateHosts];
}); });
} }
@@ -328,13 +338,14 @@ static StreamConfiguration* streamConfig;
UIComputerView* addComp = [[UIComputerView alloc] initForAddWithCallback:self]; UIComputerView* addComp = [[UIComputerView alloc] initForAddWithCallback:self];
UIComputerView* compView; UIComputerView* compView;
float prevEdge = -1; float prevEdge = -1;
@synchronized (hostList) {
for (Host* comp in hostList) { for (Host* comp in hostList) {
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;
[hostScrollView addSubview:compView]; [hostScrollView addSubview:compView];
} }
}
prevEdge = [self getCompViewX:addComp addComp:addComp prevEdge:prevEdge]; prevEdge = [self getCompViewX:addComp addComp:addComp prevEdge:prevEdge];
addComp.center = CGPointMake(prevEdge, hostScrollView.frame.size.height / 2); addComp.center = CGPointMake(prevEdge, hostScrollView.frame.size.height / 2);