From b0c2978405e223041503271010ce1268fe99d7f0 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 31 Jul 2016 17:10:32 -0700 Subject: [PATCH] Update common-c submodule with const char * change --- Limelight/Stream/Connection.h | 10 +++++----- Limelight/Stream/Connection.m | 10 +++++----- Limelight/ViewControllers/StreamFrameViewController.m | 10 +++++----- moonlight-common/moonlight-common-c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Limelight/Stream/Connection.h b/Limelight/Stream/Connection.h index d1eaae1..9754d5f 100644 --- a/Limelight/Stream/Connection.h +++ b/Limelight/Stream/Connection.h @@ -14,12 +14,12 @@ - (void) connectionStarted; - (void) connectionTerminated:(long)errorCode; -- (void) stageStarting:(char*)stageName; -- (void) stageComplete:(char*)stageName; -- (void) stageFailed:(char*)stageName withError:(long)errorCode; +- (void) stageStarting:(const char*)stageName; +- (void) stageComplete:(const char*)stageName; +- (void) stageFailed:(const char*)stageName withError:(long)errorCode; - (void) launchFailed:(NSString*)message; -- (void) displayMessage:(char*)message; -- (void) displayTransientMessage:(char*)message; +- (void) displayMessage:(const char*)message; +- (void) displayTransientMessage:(const char*)message; @end diff --git a/Limelight/Stream/Connection.m b/Limelight/Stream/Connection.m index aeedba9..598d088 100644 --- a/Limelight/Stream/Connection.m +++ b/Limelight/Stream/Connection.m @@ -229,17 +229,17 @@ void ArDecodeAndPlaySample(char* sampleData, int sampleLength) void ClStageStarting(int stage) { - [_callbacks stageStarting:(char*)LiGetStageName(stage)]; + [_callbacks stageStarting:LiGetStageName(stage)]; } void ClStageComplete(int stage) { - [_callbacks stageComplete:(char*)LiGetStageName(stage)]; + [_callbacks stageComplete:LiGetStageName(stage)]; } void ClStageFailed(int stage, long errorCode) { - [_callbacks stageFailed:(char*)LiGetStageName(stage) withError:errorCode]; + [_callbacks stageFailed:LiGetStageName(stage) withError:errorCode]; } void ClConnectionStarted(void) @@ -252,12 +252,12 @@ void ClConnectionTerminated(long errorCode) [_callbacks connectionTerminated: errorCode]; } -void ClDisplayMessage(char* message) +void ClDisplayMessage(const char* message) { [_callbacks displayMessage: message]; } -void ClDisplayTransientMessage(char* message) +void ClDisplayTransientMessage(const char* message) { [_callbacks displayTransientMessage: message]; } diff --git a/Limelight/ViewControllers/StreamFrameViewController.m b/Limelight/ViewControllers/StreamFrameViewController.m index c871a89..a6e4e8d 100644 --- a/Limelight/ViewControllers/StreamFrameViewController.m +++ b/Limelight/ViewControllers/StreamFrameViewController.m @@ -87,7 +87,7 @@ [_streamMan stopStream]; } -- (void) stageStarting:(char*)stageName { +- (void) stageStarting:(const char*)stageName { Log(LOG_I, @"Starting %s", stageName); dispatch_async(dispatch_get_main_queue(), ^{ NSString* lowerCase = [NSString stringWithFormat:@"%s in progress...", stageName]; @@ -98,10 +98,10 @@ }); } -- (void) stageComplete:(char*)stageName { +- (void) stageComplete:(const char*)stageName { } -- (void) stageFailed:(char*)stageName withError:(long)errorCode { +- (void) stageFailed:(const char*)stageName withError:(long)errorCode { Log(LOG_I, @"Stage %s failed: %ld", stageName, errorCode); dispatch_async(dispatch_get_main_queue(), ^{ @@ -132,11 +132,11 @@ }); } -- (void) displayMessage:(char*)message { +- (void) displayMessage:(const char*)message { Log(LOG_I, @"Display message: %s", message); } -- (void) displayTransientMessage:(char*)message { +- (void) displayTransientMessage:(const char*)message { Log(LOG_I, @"Display transient message: %s", message); } diff --git a/moonlight-common/moonlight-common-c b/moonlight-common/moonlight-common-c index 69c8881..86ade52 160000 --- a/moonlight-common/moonlight-common-c +++ b/moonlight-common/moonlight-common-c @@ -1 +1 @@ -Subproject commit 69c8881187590bf131f18ee150cdce65f02bdd34 +Subproject commit 86ade5204e7c8c8cc7be218940037b08bdde3b47