From 2f31f93bf8c595323d954c2e35e8fb90234ec17f Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 11 Nov 2015 18:24:36 -0800 Subject: [PATCH] Add support for GFE 2.8 --- Limelight/Network/PairManager.m | 2 +- Limelight/Stream/StreamManager.m | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Limelight/Network/PairManager.m b/Limelight/Network/PairManager.m index b81d3d4..7a0e2ad 100644 --- a/Limelight/Network/PairManager.m +++ b/Limelight/Network/PairManager.m @@ -38,7 +38,7 @@ return; } if ([serverInfoResp isStatusOk]) { - if (![[serverInfoResp getStringTag:@"currentgame"] isEqual:@"0"]) { + if (![[serverInfoResp getStringTag:@"state"] hasSuffix:@"_SERVER_AVAILABLE"]) { [_callback pairFailed:@"You must stop streaming before attempting to pair."]; } else if (![[serverInfoResp getStringTag:@"PairStatus"] isEqual:@"1"]) { [self initiatePair]; diff --git a/Limelight/Stream/StreamManager.m b/Limelight/Stream/StreamManager.m index 1ec6f10..79e3112 100644 --- a/Limelight/Stream/StreamManager.m +++ b/Limelight/Stream/StreamManager.m @@ -48,11 +48,11 @@ ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init]; [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest] fallbackError:401 fallbackRequest:[hMan newHttpServerInfoRequest]]]; - NSString* currentGame = [serverInfoResp getStringTag:@"currentgame"]; NSString* pairStatus = [serverInfoResp getStringTag:@"PairStatus"]; NSString* currentClient = [serverInfoResp getStringTag:@"CurrentClient"]; NSString* appversion = [serverInfoResp getStringTag:@"appversion"]; - if (![serverInfoResp isStatusOk] || currentGame == NULL || pairStatus == NULL || appversion == NULL) { + NSString* serverState = [serverInfoResp getStringTag:@"state"]; + if (![serverInfoResp isStatusOk] || pairStatus == NULL || appversion == NULL || serverState == NULL) { [_callbacks launchFailed:@"Failed to connect to PC"]; return; } @@ -64,7 +64,7 @@ } // resumeApp and launchApp handle calling launchFailed - if (![currentGame isEqualToString:@"0"]) { + if ([serverState hasSuffix:@"_SERVER_BUSY"]) { if (![currentClient isEqualToString:@"1"]) { // The server is streaming to someone else [_callbacks launchFailed:@"There is another stream in progress"];