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

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

Browse Source 
Conflicts:
	Limelight/ViewControllers/StreamFrameViewController.m
This commit is contained in:
Cameron Gutman
2015-01-09 16:14:50 -05:00
parent cdaf98398c 6f9c16a548
commit 600560d9e3
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Limelight/Network/AppManager.m
View File

@@ -50,10 +50,12 @@
- (void) retrieveAssetForApp:(App*)app useCache:(BOOL)useCache {
UIImage* appImage = nil;
if (useCache) {
UIImage* cachedImage = [_imageCache objectForKey:app.appId];
if (cachedImage != nil) {
appImage = cachedImage;
app.appImage = appImage;
@synchronized(_imageCache) {
UIImage* cachedImage = [_imageCache objectForKey:app.appId];
if (cachedImage != nil) {
appImage = cachedImage;
app.appImage = appImage;
}
}
}
if (appImage == nil) {
@@ -62,7 +64,9 @@
appImage = [UIImage imageWithData:appAsset];
app.appImage = appImage;
if (appImage != nil) {
[_imageCache setObject:appImage forKey:app.appId];
@synchronized(_imageCache) {
[_imageCache setObject:appImage forKey:app.appId];
}
}
}
[self performSelectorOnMainThread:@selector(sendCallBackForApp:) withObject:app waitUntilDone:NO];

14
Limelight/ViewControllers/StreamFrameViewController.m
View File

@@ -57,14 +57,26 @@
[self returnToMainFrame];
}
- (void)edgeSwiped {
[_streamMan stopStream];
[self returnToMainFrame];
}
- (void) connectionStarted {
NSLog(@"Connection started");
dispatch_async(dispatch_get_main_queue(), ^{
[self.spinner stopAnimating];
[self.stageLabel setText:@"Waiting for first frame..."];
[self.stageLabel sizeToFit];
[(StreamView*)self.view setupOnScreenControls: _controllerSupport];
UIScreenEdgePanGestureRecognizer* swipeGesture = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:self action:@selector(edgeSwiped)];
swipeGesture.edges = UIRectEdgeLeft;
if (swipeGesture == nil) {
NSLog(@"An error occured trying to create UIScreenEdgePanGestureRecognizer");
} else {
[self.view addGestureRecognizer:swipeGesture];
}
});
[(StreamView*)self.view setupOnScreenControls: _controllerSupport];
}
- (void)connectionTerminated:(long)errorCode {