From 23e9d48b0dd8b364b34e9e0f5026dd3d4371ad94 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 16 Aug 2015 12:27:21 -0700 Subject: [PATCH] Update common-c and use the new LiInitializeXXX() functions --- Limelight/Stream/Connection.m | 7 +++++-- limelight-common-c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Limelight/Stream/Connection.m b/Limelight/Stream/Connection.m index 8dfaa56..5941dcd 100644 --- a/Limelight/Stream/Connection.m +++ b/Limelight/Stream/Connection.m @@ -280,6 +280,8 @@ void ClDisplayTransientMessage(char* message) renderer = myRenderer; _callbacks = callbacks; _serverMajorVersion = serverMajorVersion; + + LiInitializeStreamConfiguration(&_streamConfig); _streamConfig.width = config.width; _streamConfig.height = config.height; _streamConfig.fps = config.frameRate; @@ -293,14 +295,15 @@ void ClDisplayTransientMessage(char* message) int riKeyId = htonl(config.riKeyId); memcpy(_streamConfig.remoteInputAesIv, &riKeyId, sizeof(riKeyId)); - memset(&_drCallbacks, 0, sizeof(_drCallbacks)); + LiInitializeVideoCallbacks(&_drCallbacks); _drCallbacks.submitDecodeUnit = DrSubmitDecodeUnit; - memset(&_arCallbacks, 0, sizeof(_arCallbacks)); + LiInitializeAudioCallbacks(&_arCallbacks); _arCallbacks.init = ArInit; _arCallbacks.cleanup = ArCleanup; _arCallbacks.decodeAndPlaySample = ArDecodeAndPlaySample; + LiInitializeConnectionCallbacks(&_clCallbacks); _clCallbacks.stageStarting = ClStageStarting; _clCallbacks.stageComplete = ClStageComplete; _clCallbacks.stageFailed = ClStageFailed; diff --git a/limelight-common-c b/limelight-common-c index 7500382..19849a1 160000 --- a/limelight-common-c +++ b/limelight-common-c @@ -1 +1 @@ -Subproject commit 7500382c2653eeb44068817d0a43c1d946410918 +Subproject commit 19849a1ac5582ff650a0a41df7e8728490f01013