From 314f32388a4af6fa3bcdeea6dde7cba2b969c297 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 1 Jun 2018 19:11:10 -0700 Subject: [PATCH] Use the app name in the "Starting App" text --- Limelight/Stream/StreamConfiguration.h | 1 + Limelight/Stream/StreamConfiguration.m | 2 +- Limelight/ViewControllers/MainFrameViewController.m | 1 + Limelight/ViewControllers/StreamFrameViewController.m | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Limelight/Stream/StreamConfiguration.h b/Limelight/Stream/StreamConfiguration.h index d3a6b28..787778a 100644 --- a/Limelight/Stream/StreamConfiguration.h +++ b/Limelight/Stream/StreamConfiguration.h @@ -12,6 +12,7 @@ @property NSString* appVersion; @property NSString* gfeVersion; @property NSString* appID; +@property NSString* appName; @property int width; @property int height; @property int frameRate; diff --git a/Limelight/Stream/StreamConfiguration.m b/Limelight/Stream/StreamConfiguration.m index 2aeebe7..19fb3e2 100644 --- a/Limelight/Stream/StreamConfiguration.m +++ b/Limelight/Stream/StreamConfiguration.m @@ -9,5 +9,5 @@ #import "StreamConfiguration.h" @implementation StreamConfiguration -@synthesize host, appID, width, height, frameRate, bitRate, riKeyId, riKey, gamepadMask, streamingRemotely; +@synthesize host, appID, width, height, frameRate, bitRate, riKeyId, riKey, gamepadMask, streamingRemotely, appName; @end diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m index ca2d414..ad5c641 100644 --- a/Limelight/ViewControllers/MainFrameViewController.m +++ b/Limelight/ViewControllers/MainFrameViewController.m @@ -420,6 +420,7 @@ static NSMutableSet* hostList; _streamConfig = [[StreamConfiguration alloc] init]; _streamConfig.host = app.host.activeAddress; _streamConfig.appID = app.id; + _streamConfig.appName = app.name; DataManager* dataMan = [[DataManager alloc] init]; TemporarySettings* streamSettings = [dataMan getSettings]; diff --git a/Limelight/ViewControllers/StreamFrameViewController.m b/Limelight/ViewControllers/StreamFrameViewController.m index 588e962..ef264a7 100644 --- a/Limelight/ViewControllers/StreamFrameViewController.m +++ b/Limelight/ViewControllers/StreamFrameViewController.m @@ -34,8 +34,9 @@ [self.navigationController setNavigationBarHidden:YES animated:YES]; - [self.stageLabel setText:@"Starting App"]; + [self.stageLabel setText:[NSString stringWithFormat:@"Starting %@...", self.streamConfig.appName]]; [self.stageLabel sizeToFit]; + self.stageLabel.textAlignment = NSTextAlignmentCenter; self.stageLabel.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2); self.spinner.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2 - self.stageLabel.frame.size.height - self.spinner.frame.size.height); [UIApplication sharedApplication].idleTimerDisabled = YES;