moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-08-18 01:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate symbols

Browse Source
This commit is contained in:
Cameron Gutman 2014-10-21 03:05:51 -04:00
parent 88d8c8ede7
commit affcb84d36
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
limelight-common/Connection.c
View File

@ -90,27 +90,27 @@ void LiStopConnection(void) {
LC_ASSERT(stage == STAGE_NONE); LC_ASSERT(stage == STAGE_NONE);
} }
static void ClStageStarting(int stage) static void ClInternalStageStarting(int stage)
{ {
originalCallbacks.stageStarting(stage); originalCallbacks.stageStarting(stage);
} }
static void ClStageComplete(int stage) static void ClInternalStageComplete(int stage)
{ {
originalCallbacks.stageComplete(stage); originalCallbacks.stageComplete(stage);
} }
static void ClStageFailed(int stage, long errorCode) static void ClInternalStageFailed(int stage, long errorCode)
{ {
originalCallbacks.stageFailed(stage, errorCode); originalCallbacks.stageFailed(stage, errorCode);
} }
static void ClConnectionStarted(void) static void ClInternalConnectionStarted(void)
{ {
originalCallbacks.connectionStarted(); originalCallbacks.connectionStarted();
} }
static void ClConnectionTerminated(long errorCode) static void ClInternalConnectionTerminated(long errorCode)
{ {
// Avoid recursion and issuing multiple callbacks // Avoid recursion and issuing multiple callbacks
if (alreadyTerminated) { if (alreadyTerminated) {
@ -121,12 +121,12 @@ static void ClConnectionTerminated(long errorCode)
originalCallbacks.connectionTerminated(errorCode); originalCallbacks.connectionTerminated(errorCode);
} }
void ClDisplayMessage(char* message) void ClInternalDisplayMessage(char* message)
{ {
originalCallbacks.displayMessage(message); originalCallbacks.displayMessage(message);
} }
void ClDisplayTransientMessage(char* message) void ClInternalDisplayTransientMessage(char* message)
{ {
originalCallbacks.displayTransientMessage(message); originalCallbacks.displayTransientMessage(message);
} }
@ -137,13 +137,13 @@ int LiStartConnection(IP_ADDRESS host, PSTREAM_CONFIGURATION streamConfig, PCONN
memcpy(&originalCallbacks, clCallbacks, sizeof(originalCallbacks)); memcpy(&originalCallbacks, clCallbacks, sizeof(originalCallbacks));
listenerCallbacks.stageStarting = ClStageStarting; listenerCallbacks.stageStarting = ClInternalStageStarting;
listenerCallbacks.stageComplete = ClStageComplete; listenerCallbacks.stageComplete = ClInternalStageComplete;
listenerCallbacks.stageFailed = ClStageFailed; listenerCallbacks.stageFailed = ClInternalStageFailed;
listenerCallbacks.connectionStarted = ClConnectionStarted; listenerCallbacks.connectionStarted = ClInternalConnectionStarted;
listenerCallbacks.connectionTerminated = ClConnectionTerminated; listenerCallbacks.connectionTerminated = ClInternalConnectionTerminated;
listenerCallbacks.displayMessage = ClDisplayMessage; listenerCallbacks.displayMessage = ClInternalDisplayMessage;
listenerCallbacks.displayTransientMessage = ClDisplayTransientMessage; listenerCallbacks.displayTransientMessage = ClInternalDisplayTransientMessage;
alreadyTerminated = 0; alreadyTerminated = 0;