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

Change errorCode to int for consistency between 32-bit and 64-bit platforms

Browse Source 
Unfortunately this requires updating all client code that uses these callbacks.
This commit is contained in:
Cameron Gutman 2020-02-24 22:55:45 -08:00
parent cfeb0ffd90
commit 2fc278da00
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Connection.c
View File

@ -5,7 +5,7 @@ static int stage = STAGE_NONE;
static ConnListenerConnectionTerminated originalTerminationCallback; static ConnListenerConnectionTerminated originalTerminationCallback;
static int alreadyTerminated; static int alreadyTerminated;
static PLT_THREAD terminationCallbackThread; static PLT_THREAD terminationCallbackThread;
static long terminationCallbackErrorCode; static int terminationCallbackErrorCode;
// Common globals // Common globals
char* RemoteAddrString; char* RemoteAddrString;
@ -141,7 +141,7 @@ static void terminationCallbackThreadFunc(void* context)
// calls LiStopConnection() in the callback when the cleanup code // calls LiStopConnection() in the callback when the cleanup code
// attempts to join the thread that the termination callback (and LiStopConnection) // attempts to join the thread that the termination callback (and LiStopConnection)
// is running on. // is running on.
static void ClInternalConnectionTerminated(long errorCode) static void ClInternalConnectionTerminated(int errorCode)
{ {
int err; int err;

2
src/ControlStream.c
View File

@ -466,7 +466,7 @@ static void controlReceiveThreadFunc(void* context) {
return; return;
} }
long terminationErrorCode = -1; int terminationErrorCode = -1;
while (!PltIsThreadInterrupted(&controlReceiveThread)) { while (!PltIsThreadInterrupted(&controlReceiveThread)) {
ENetEvent event; ENetEvent event;

4
src/FakeCallbacks.c
View File

@ -30,9 +30,9 @@ AUDIO_RENDERER_CALLBACKS fakeArCallbacks = {
static void fakeClStageStarting(int stage) {} static void fakeClStageStarting(int stage) {}
static void fakeClStageComplete(int stage) {} static void fakeClStageComplete(int stage) {}
static void fakeClStageFailed(int stage, long errorCode) {} static void fakeClStageFailed(int stage, int errorCode) {}
static void fakeClConnectionStarted(void) {} static void fakeClConnectionStarted(void) {}
static void fakeClConnectionTerminated(long errorCode) {} static void fakeClConnectionTerminated(int errorCode) {}
static void fakeClLogMessage(const char* format, ...) {} static void fakeClLogMessage(const char* format, ...) {}
static void fakeClRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) {} static void fakeClRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) {}
static void fakeClConnectionStatusUpdate(int connectionStatus) {} static void fakeClConnectionStatusUpdate(int connectionStatus) {}

4
src/Limelight.h
View File

@ -316,7 +316,7 @@ typedef void(*ConnListenerStageComplete)(int stage);
// ConnListenerConnectionTerminated() will not be invoked because the connection was // ConnListenerConnectionTerminated() will not be invoked because the connection was
// not yet fully established. LiInterruptConnection() and LiStopConnection() may // not yet fully established. LiInterruptConnection() and LiStopConnection() may
// result in this callback being invoked, but it is not guaranteed. // result in this callback being invoked, but it is not guaranteed.
typedef void(*ConnListenerStageFailed)(int stage, long errorCode); typedef void(*ConnListenerStageFailed)(int stage, int errorCode);
// This callback is invoked after the connection is successfully established // This callback is invoked after the connection is successfully established
typedef void(*ConnListenerConnectionStarted)(void); typedef void(*ConnListenerConnectionStarted)(void);
@ -327,7 +327,7 @@ typedef void(*ConnListenerConnectionStarted)(void);
// non-zero, it means the termination was probably unexpected (loss of network, // non-zero, it means the termination was probably unexpected (loss of network,
// crash, or similar conditions). This will not be invoked as a result of a call // crash, or similar conditions). This will not be invoked as a result of a call
// to LiStopConnection() or LiInterruptConnection(). // to LiStopConnection() or LiInterruptConnection().
typedef void(*ConnListenerConnectionTerminated)(long errorCode); typedef void(*ConnListenerConnectionTerminated)(int errorCode);
// This callback is invoked to log debug message // This callback is invoked to log debug message
typedef void(*ConnListenerLogMessage)(const char* format, ...); typedef void(*ConnListenerLogMessage)(const char* format, ...);