From 742bb7b5169c78a065481bd310b3ef8815519ff9 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 25 Feb 2020 00:00:00 -0800 Subject: [PATCH] Change errorCode from long to int --- Limelight/Stream/Connection.h | 4 ++-- Limelight/Stream/Connection.m | 4 ++-- Limelight/ViewControllers/StreamFrameViewController.m | 10 +++++----- moonlight-common/moonlight-common-c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Limelight/Stream/Connection.h b/Limelight/Stream/Connection.h index 0ba2733a..1cddc2d5 100644 --- a/Limelight/Stream/Connection.h +++ b/Limelight/Stream/Connection.h @@ -12,10 +12,10 @@ @protocol ConnectionCallbacks - (void) connectionStarted; -- (void) connectionTerminated:(long)errorCode; +- (void) connectionTerminated:(int)errorCode; - (void) stageStarting:(const char*)stageName; - (void) stageComplete:(const char*)stageName; -- (void) stageFailed:(const char*)stageName withError:(long)errorCode; +- (void) stageFailed:(const char*)stageName withError:(int)errorCode; - (void) launchFailed:(NSString*)message; - (void) rumble:(unsigned short)controllerNumber lowFreqMotor:(unsigned short)lowFreqMotor highFreqMotor:(unsigned short)highFreqMotor; - (void) connectionStatusUpdate:(int)status; diff --git a/Limelight/Stream/Connection.m b/Limelight/Stream/Connection.m index fd401b66..206c66b6 100644 --- a/Limelight/Stream/Connection.m +++ b/Limelight/Stream/Connection.m @@ -251,7 +251,7 @@ void ClStageComplete(int stage) [_callbacks stageComplete:LiGetStageName(stage)]; } -void ClStageFailed(int stage, long errorCode) +void ClStageFailed(int stage, int errorCode) { [_callbacks stageFailed:LiGetStageName(stage) withError:errorCode]; } @@ -261,7 +261,7 @@ void ClConnectionStarted(void) [_callbacks connectionStarted]; } -void ClConnectionTerminated(long errorCode) +void ClConnectionTerminated(int errorCode) { [_callbacks connectionTerminated: errorCode]; } diff --git a/Limelight/ViewControllers/StreamFrameViewController.m b/Limelight/ViewControllers/StreamFrameViewController.m index 6e675712..9ea31c39 100644 --- a/Limelight/ViewControllers/StreamFrameViewController.m +++ b/Limelight/ViewControllers/StreamFrameViewController.m @@ -230,8 +230,8 @@ }); } -- (void)connectionTerminated:(long)errorCode { - Log(LOG_I, @"Connection terminated: %ld", errorCode); +- (void)connectionTerminated:(int)errorCode { + Log(LOG_I, @"Connection terminated: %d", errorCode); dispatch_async(dispatch_get_main_queue(), ^{ // Allow the display to go to sleep now @@ -264,15 +264,15 @@ - (void) stageComplete:(const char*)stageName { } -- (void) stageFailed:(const char*)stageName withError:(long)errorCode { - Log(LOG_I, @"Stage %s failed: %ld", stageName, errorCode); +- (void) stageFailed:(const char*)stageName withError:(int)errorCode { + Log(LOG_I, @"Stage %s failed: %d", stageName, errorCode); dispatch_async(dispatch_get_main_queue(), ^{ // Allow the display to go to sleep now [UIApplication sharedApplication].idleTimerDisabled = NO; UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Connection Failed" - message:[NSString stringWithFormat:@"%s failed with error %ld", + message:[NSString stringWithFormat:@"%s failed with error %d", stageName, errorCode] preferredStyle:UIAlertControllerStyleAlert]; [Utils addHelpOptionToDialog:alert]; diff --git a/moonlight-common/moonlight-common-c b/moonlight-common/moonlight-common-c index f5ae5df5..67390dfb 160000 --- a/moonlight-common/moonlight-common-c +++ b/moonlight-common/moonlight-common-c @@ -1 +1 @@ -Subproject commit f5ae5df5d0689084293dbce3c20a6ff2322c9c2c +Subproject commit 67390dfb94c3a664c8e74045281077e69e443759