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

Add direct-to-desktop mode

Browse Source
This commit is contained in:
Cameron Gutman
2020-08-12 22:26:56 -07:00
parent 0b712a1589
commit e445989ec7
1 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Limelight/ViewControllers/MainFrameViewController.m
View File

@@ -158,8 +158,15 @@ static NSMutableSet* hostList;
return;
}
[self updateAppsForHost:host];
[self hideLoadingFrame: nil];
if ([self isHostDirectToDesktop:host]) {
[self hideLoadingFrame: nil];
[self prepareToStreamApp:[host.appList anyObject]];
[self performSegueWithIdentifier:@"createStreamFrame" sender:nil];
}
else {
[self updateAppsForHost:host];
[self hideLoadingFrame: nil];
}
});
}
Log(LOG_I, @"Using cached app list: %d", usingCachedAppList);
@@ -199,10 +206,18 @@ static NSMutableSet* hostList;
return;
}
[self updateAppsForHost:host];
[self->_appManager stopRetrieving];
[self->_appManager retrieveAssetsFromHost:host];
[self hideLoadingFrame: nil];
// We'll hit this case on the first load after pairing
if (!usingCachedAppList && [self isHostDirectToDesktop:host]) {
[self hideLoadingFrame: nil];
[self prepareToStreamApp:[host.appList anyObject]];
[self performSegueWithIdentifier:@"createStreamFrame" sender:nil];
}
else {
[self updateAppsForHost:host];
[self->_appManager stopRetrieving];
[self->_appManager retrieveAssetsFromHost:host];
[self hideLoadingFrame: nil];
}
});
}
});
@@ -866,7 +881,8 @@ static NSMutableSet* hostList;
[self retrieveSavedHosts];
_discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self];
if ([hostList count] == 1) {
if ([hostList count] == 1 && [[hostList anyObject] appList].count > 0 && ![self isHostDirectToDesktop:[hostList anyObject]]) {
// Launch directly to the applist if this is the only host (and it's not a direct-to-desktop host)
[self hostClicked:[hostList anyObject] view:nil];
}
else {
@@ -979,6 +995,26 @@ static NSMutableSet* hostList;
{
[super viewWillAppear:animated];
// If we're returning from a direct-to-desktop stream, show the host selection view
if (_selectedHost != nil && [self isHostDirectToDesktop:_selectedHost]) {
// _selectedHost will get wiped out by showHostSelectionView, so we need to save it
TemporaryHost* host = self->_selectedHost;
// Quit the remote desktop stream
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
HttpManager* hMan = [[HttpManager alloc] initWithHost:host.activeAddress uniqueId:self->_uniqueId serverCert:host.serverCert];
HttpResponse* quitResponse = [[HttpResponse alloc] init];
HttpRequest* quitRequest = [HttpRequest requestForResponse: quitResponse withUrlRequest:[hMan newQuitAppRequest]];
// Exempt this host from discovery while handling the quit operation
[self->_discMan pauseDiscoveryForHost:host];
[hMan executeRequestSynchronously:quitRequest];
[self->_discMan resumeDiscoveryForHost:host];
});
[self showHostSelectionView];
}
// We can get here on home press while streaming
// since the stream view segues to us just before
// entering the background. We can't check the app
@@ -1173,6 +1209,21 @@ static NSMutableSet* hostList;
}
}
- (BOOL) isHostDirectToDesktop:(TemporaryHost*)host {
// To comply with App Store Guidelines 4.2.7, we will go directly to the stream
// like a remote desktop solution if the host is configured to support that.
if ([host.appList count] == 1) {
TemporaryApp* app = [host.appList anyObject];
return [app.name isEqualToString:@"mstsc.exe"] ||
[app.name isEqualToString:@"Remote Desktop"] ||
[app.name isEqualToString:@"Desktop Stream"] ||
[app.name isEqualToString:@"Desktop"];
}
return false;
}
- (void) updateAppsForHost:(TemporaryHost*)host {
if (host != _selectedHost) {
Log(LOG_W, @"Mismatched host during app update");