Deprecate connection listener message callbacks

This commit is contained in:
Cameron Gutman 2019-03-17 01:34:04 -07:00
parent 6eb17a8e73
commit 4a7d28038d
2 changed files with 2 additions and 19 deletions

View File

@ -33,8 +33,6 @@ static void fakeClStageComplete(int stage) {}
static void fakeClStageFailed(int stage, long errorCode) {}
static void fakeClConnectionStarted(void) {}
static void fakeClConnectionTerminated(long errorCode) {}
static void fakeClDisplayMessage(const char* message) {}
static void fakeClDisplayTransientMessage(const char* message) {}
static void fakeClLogMessage(const char* format, ...) {}
static void fakeClRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) {}
@ -44,8 +42,6 @@ static CONNECTION_LISTENER_CALLBACKS fakeClCallbacks = {
.stageFailed = fakeClStageFailed,
.connectionStarted = fakeClConnectionStarted,
.connectionTerminated = fakeClConnectionTerminated,
.displayMessage = fakeClDisplayMessage,
.displayTransientMessage = fakeClDisplayTransientMessage,
.logMessage = fakeClLogMessage,
.rumble = fakeClRumble,
};
@ -114,12 +110,6 @@ void fixupMissingCallbacks(PDECODER_RENDERER_CALLBACKS* drCallbacks, PAUDIO_REND
if ((*clCallbacks)->connectionTerminated == NULL) {
(*clCallbacks)->connectionTerminated = fakeClConnectionTerminated;
}
if ((*clCallbacks)->displayMessage == NULL) {
(*clCallbacks)->displayMessage = fakeClDisplayMessage;
}
if ((*clCallbacks)->displayTransientMessage == NULL) {
(*clCallbacks)->displayTransientMessage = fakeClDisplayTransientMessage;
}
if ((*clCallbacks)->logMessage == NULL) {
(*clCallbacks)->logMessage = fakeClLogMessage;
}

View File

@ -294,13 +294,6 @@ typedef void(*ConnListenerConnectionStarted)(void);
// to LiStopConnection() or LiInterruptConnection().
typedef void(*ConnListenerConnectionTerminated)(long errorCode);
// This callback is invoked to display a dialog-type message to the user
typedef void(*ConnListenerDisplayMessage)(const char* message);
// This callback is invoked to display a transient message for the user
// while streaming
typedef void(*ConnListenerDisplayTransientMessage)(const char* message);
// This callback is invoked to log debug message
typedef void(*ConnListenerLogMessage)(const char* format, ...);
@ -317,8 +310,8 @@ typedef struct _CONNECTION_LISTENER_CALLBACKS {
ConnListenerStageFailed stageFailed;
ConnListenerConnectionStarted connectionStarted;
ConnListenerConnectionTerminated connectionTerminated;
ConnListenerDisplayMessage displayMessage;
ConnListenerDisplayTransientMessage displayTransientMessage;
void* deprecated1; // was displayMessage()
void* deprecated2; // was displayTransientMessage()
ConnListenerLogMessage logMessage;
ConnListenerRumble rumble;
} CONNECTION_LISTENER_CALLBACKS, *PCONNECTION_LISTENER_CALLBACKS;