From 6b97af13bf1942ee32ff986668532b269a0e71f1 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 13 May 2015 23:13:20 -0500 Subject: [PATCH] Update common-c and remove unused callbacks --- Limelight/Stream/Connection.m | 34 +++++----------------------------- limelight-common-c | 2 +- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/Limelight/Stream/Connection.m b/Limelight/Stream/Connection.m index e6fc58f..88b64ba 100644 --- a/Limelight/Stream/Connection.m +++ b/Limelight/Stream/Connection.m @@ -45,10 +45,6 @@ static int audioBufferQueueLength; static AudioComponentInstance audioUnit; static VideoDecoderRenderer* renderer; -void DrSetup(int width, int height, int fps, void* context, int drFlags) -{ -} - int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) { int offset = 0; @@ -69,18 +65,6 @@ int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) return [renderer submitDecodeBuffer:data length:decodeUnit->fullLength]; } -void DrStart(void) -{ -} - -void DrStop(void) -{ -} - -void DrRelease(void) -{ -} - void ArInit(void) { int err; @@ -315,10 +299,10 @@ void ClDisplayTransientMessage(char* message) int riKeyId = htonl(config.riKeyId); memcpy(_streamConfig.remoteInputAesIv, &riKeyId, sizeof(riKeyId)); - _drCallbacks.setup = DrSetup; - _drCallbacks.start = DrStart; - _drCallbacks.stop = DrStop; - _drCallbacks.release = DrRelease; + _drCallbacks.setup = NULL; + _drCallbacks.start = NULL; + _drCallbacks.stop = NULL; + _drCallbacks.release = NULL; _drCallbacks.submitDecodeUnit = DrSubmitDecodeUnit; _arCallbacks.init = ArInit; @@ -421,21 +405,13 @@ static OSStatus playbackCallback(void *inRefCon, -(void) main { - PLATFORM_CALLBACKS dummyPlCallbacks; - - // Only used on Windows - dummyPlCallbacks.threadStart = NULL; - dummyPlCallbacks.debugPrint = NULL; - LiStartConnection(_host, &_streamConfig, &_clCallbacks, &_drCallbacks, &_arCallbacks, - &dummyPlCallbacks, + NULL, NULL, 0, _serverMajorVersion); } - - @end diff --git a/limelight-common-c b/limelight-common-c index b74b54b..dcc1b93 160000 --- a/limelight-common-c +++ b/limelight-common-c @@ -1 +1 @@ -Subproject commit b74b54be53087b713ed9c1581d15344de74cdec7 +Subproject commit dcc1b932de79ca0d1e5db5803d4808423adbd649